June 2016 - U-Boot

[U-Boot] [PATCH] ti_omap5_common: Find right dtb file for DRA72-RevC Evm
by Lokesh Vutla 02 Jul '16

02 Jul '16

DRA72-Evm revC uses dra72-evm-revc.dtb. Update the same in env vatiables. Signed-off-by: Lokesh Vutla <lokeshvutla(a)ti.com> --- board/ti/dra7xx/evm.c | 10 +++++++--- include/configs/ti_omap5_common.h | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c index 0394e4e..6a4d027 100644 --- a/board/ti/dra7xx/evm.c +++ b/board/ti/dra7xx/evm.c @@ -413,10 +413,14 @@ int board_late_init(void) #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG char *name = "unknown"; - if (is_dra72x()) - name = "dra72x"; - else + if (is_dra72x()) { + if (board_is_dra72x_revc_or_later()) + name = "dra72x-revc"; + else + name = "dra72x"; + } else { name = "dra7xx"; + } set_board_info_env(name); diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h index 2e4c8e9..3589cdc 100644 --- a/include/configs/ti_omap5_common.h +++ b/include/configs/ti_omap5_common.h @@ -100,6 +100,8 @@ "setenv fdtfile omap5-uevm.dtb; fi; " \ "if test $board_name = dra7xx; then " \ "setenv fdtfile dra7-evm.dtb; fi;" \ + "if test $board_name = dra72x-revc; then " \ + "setenv fdtfile dra72-evm-revc.dtb; fi;" \ "if test $board_name = dra72x; then " \ "setenv fdtfile dra72-evm.dtb; fi;" \ "if test $board_name = beagle_x15; then " \ -- 2.9.0

2 1

[U-Boot] [PATCH v3 0/6] autoboot cleanups
by Masahiro Yamada 02 Jul '16

02 Jul '16

1/6 moves CONFIG_BOOTDELAY for a new SOCFPGA board. The rest of this series are clean-ups of autoboot code. Masahiro Yamada (6): ARM: socfpga: move CONFIG_BOOTDELAY to Kconfig for IS1 board doc: bootdelay: drop explanation about CONFIG_BOOTDELAY from README autoboot: remove CONFIG_ZERO_BOOTDELAY_CHECK autoboot: rename abortboot_{keyed, normal} to __abortboot autoboot: move CONFIG_SILENT_CONSOLE handling autoboot: move bootdelay >= 0 check to abortboot() README | 17 -------- common/Kconfig | 4 +- common/autoboot.c | 49 ++++++++-------------- configs/brppt1_mmc_defconfig | 2 +- configs/brppt1_nand_defconfig | 2 +- configs/brppt1_spi_defconfig | 2 +- configs/brxre1_defconfig | 2 +- configs/cairo_defconfig | 2 +- .../controlcenterd_TRAILBLAZER_DEVELOP_defconfig | 2 +- configs/controlcenterd_TRAILBLAZER_defconfig | 2 +- configs/omap3_evm_quick_mmc_defconfig | 2 +- configs/omap3_evm_quick_nand_defconfig | 2 +- configs/socfpga_is1_defconfig | 4 +- doc/README.autoboot | 8 ---- include/configs/CPCI2DP.h | 2 - include/configs/CPCI4052.h | 2 - include/configs/MIP405.h | 1 - include/configs/PIP405.h | 1 - include/configs/PLU405.h | 1 - include/configs/PMC405DE.h | 1 - include/configs/PMC440.h | 1 - include/configs/VCMA9.h | 1 - include/configs/VOM405.h | 1 - include/configs/a3m071.h | 1 - include/configs/amcc-common.h | 1 - include/configs/apf27.h | 1 - include/configs/calimain.h | 1 - include/configs/cm_t35.h | 2 - include/configs/cm_t3517.h | 2 - include/configs/cm_t43.h | 1 - include/configs/devkit3250.h | 1 - include/configs/digsy_mtc.h | 1 - include/configs/dlvision-10g.h | 2 - include/configs/exynos-common.h | 2 - include/configs/gdppc440etx.h | 2 - include/configs/hrcon.h | 2 - include/configs/intip.h | 2 - include/configs/io.h | 2 - include/configs/io64.h | 2 - include/configs/iocon.h | 2 - include/configs/legoev3.h | 1 - include/configs/meesc.h | 2 - include/configs/omap3_logic.h | 1 - include/configs/pcm030.h | 5 --- include/configs/r7780mp.h | 3 -- include/configs/s5p_goni.h | 2 - include/configs/smdk2410.h | 1 - include/configs/smdkc100.h | 3 -- include/configs/snapper9260.h | 1 - include/configs/snapper9g45.h | 1 - include/configs/socfpga_is1.h | 1 - include/configs/spear-common.h | 1 - include/configs/strider.h | 2 - include/configs/theadorable.h | 1 - include/configs/tricorder.h | 1 - include/configs/uniphier.h | 2 - include/configs/vinco.h | 1 - include/configs/work_92105.h | 2 - include/configs/x600.h | 1 - include/configs/xilinx-ppc.h | 1 - 60 files changed, 30 insertions(+), 141 deletions(-) -- 1.9.1

3 13

[U-Boot] [PATCH v2] ARM: AM437x: Align HS device variant defconfig filename
by Andreas Dannenberg 02 Jul '16

02 Jul '16

Align the name of the defconfig file for high-security (HS) device variants from the AM43xx family of SoCs with the corresponding name used for the general purpose devices. This allows for easier cross-association of those files and also provides room to grow from an HS device part number perspective. Furthermore, update and cleanup associated MAINTAINERS file. Signed-off-by: Andreas Dannenberg <dannenberg(a)ti.com> Cc: Lokesh Vutla <lokeshvutla(a)ti.com> Cc: Madan Srinivas <madans(a)ti.com> --- Update since last patch: Added defconfig file to MAINTAINERS doc. Also took the liberty to swap two entries in said MAINTAINERS file so that the list of defconfig files is in alphabetical order (allows for easier comparison with the associated directory contents). board/ti/am43xx/MAINTAINERS | 3 ++- configs/am437x_hs_evm_defconfig | 59 ----------------------------------------- configs/am43xx_hs_evm_defconfig | 59 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 60 deletions(-) delete mode 100644 configs/am437x_hs_evm_defconfig create mode 100644 configs/am43xx_hs_evm_defconfig diff --git a/board/ti/am43xx/MAINTAINERS b/board/ti/am43xx/MAINTAINERS index 3d40b17..83645ac 100644 --- a/board/ti/am43xx/MAINTAINERS +++ b/board/ti/am43xx/MAINTAINERS @@ -4,6 +4,7 @@ S: Maintained F: board/ti/am43xx/ F: include/configs/am43xx_evm.h F: configs/am43xx_evm_defconfig -F: configs/am43xx_evm_qspiboot_defconfig F: configs/am43xx_evm_ethboot_defconfig +F: configs/am43xx_evm_qspiboot_defconfig F: configs/am43xx_evm_usbhost_boot_defconfig +F: configs/am43xx_hs_evm_defconfig diff --git a/configs/am437x_hs_evm_defconfig b/configs/am437x_hs_evm_defconfig deleted file mode 100644 index 4856a19..0000000 --- a/configs/am437x_hs_evm_defconfig +++ /dev/null @@ -1,59 +0,0 @@ -CONFIG_ARM=y -CONFIG_AM43XX=y -CONFIG_TI_SECURE_DEVICE=y -CONFIG_TARGET_AM43XX_EVM=y -CONFIG_DM_SERIAL=y -CONFIG_DM_GPIO=y -CONFIG_SPL_STACK_R_ADDR=0x82000000 -# Device tree file can be same on HS evm -CONFIG_DEFAULT_DEVICE_TREE="am437x-gp-evm" -CONFIG_SPL=y -CONFIG_ISW_ENTRY_ADDR=0x40302ae0 -CONFIG_SPL_STACK_R=y -CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1, NAND" -CONFIG_SPL_LOAD_FIT=y -CONFIG_HUSH_PARSER=y -CONFIG_CMD_BOOTZ=y -# CONFIG_CMD_IMLS is not set -CONFIG_CMD_ASKENV=y -# CONFIG_CMD_FLASH is not set -CONFIG_CMD_MMC=y -CONFIG_CMD_SF=y -CONFIG_CMD_SPI=y -CONFIG_CMD_I2C=y -CONFIG_CMD_USB=y -CONFIG_CMD_DFU=y -CONFIG_CMD_GPIO=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_EXT4=y -CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y -CONFIG_OF_CONTROL=y -CONFIG_OF_LIST="am437x-gp-evm" -CONFIG_DM=y -CONFIG_DM_MMC=y -CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_MACRONIX=y -CONFIG_SYS_NS16550=y -CONFIG_TI_QSPI=y -CONFIG_TIMER=y -CONFIG_OMAP_TIMER=y -CONFIG_USB=y -CONFIG_USB_XHCI_HCD=y -CONFIG_USB_XHCI_DWC3=y -CONFIG_USB_DWC3=y -CONFIG_USB_DWC3_GADGET=y -CONFIG_USB_DWC3_OMAP=y -CONFIG_USB_DWC3_PHY_OMAP=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_DOWNLOAD=y -CONFIG_G_DNL_MANUFACTURER="Texas Instruments" -CONFIG_G_DNL_VENDOR_NUM=0x0403 -CONFIG_G_DNL_PRODUCT_NUM=0xbd00 -CONFIG_SPL_OF_LIBFDT=y diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig new file mode 100644 index 0000000..4856a19 --- /dev/null +++ b/configs/am43xx_hs_evm_defconfig @@ -0,0 +1,59 @@ +CONFIG_ARM=y +CONFIG_AM43XX=y +CONFIG_TI_SECURE_DEVICE=y +CONFIG_TARGET_AM43XX_EVM=y +CONFIG_DM_SERIAL=y +CONFIG_DM_GPIO=y +CONFIG_SPL_STACK_R_ADDR=0x82000000 +# Device tree file can be same on HS evm +CONFIG_DEFAULT_DEVICE_TREE="am437x-gp-evm" +CONFIG_SPL=y +CONFIG_ISW_ENTRY_ADDR=0x40302ae0 +CONFIG_SPL_STACK_R=y +CONFIG_FIT=y +CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1, NAND" +CONFIG_SPL_LOAD_FIT=y +CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y +# CONFIG_CMD_IMLS is not set +CONFIG_CMD_ASKENV=y +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y +CONFIG_CMD_SPI=y +CONFIG_CMD_I2C=y +CONFIG_CMD_USB=y +CONFIG_CMD_DFU=y +CONFIG_CMD_GPIO=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_OF_CONTROL=y +CONFIG_OF_LIST="am437x-gp-evm" +CONFIG_DM=y +CONFIG_DM_MMC=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_SYS_NS16550=y +CONFIG_TI_QSPI=y +CONFIG_TIMER=y +CONFIG_OMAP_TIMER=y +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_DWC3=y +CONFIG_USB_DWC3_GADGET=y +CONFIG_USB_DWC3_OMAP=y +CONFIG_USB_DWC3_PHY_OMAP=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Texas Instruments" +CONFIG_G_DNL_VENDOR_NUM=0x0403 +CONFIG_G_DNL_PRODUCT_NUM=0xbd00 +CONFIG_SPL_OF_LIBFDT=y -- 2.6.4

2 1

[U-Boot] [PATCH] driver: qspi: correct QSPI disable CS reset value
by Ravi Babu 02 Jul '16

02 Jul '16

From: Praneeth Bajjuri <praneeth(a)ti.com> Correcting QSPI disable/unselect CS reset value. CTRL_CORE_CONTROL_IO_2: QSPI_MEMMAPPED_CS[10:8] This is not causing any issue, but its better to untouch the reserved bits. Praneeth Bajjuri <praneeth(a)ti.com> Signed-off-by: Ravi Babu <ravibabu(a)ti.com> --- drivers/spi/ti_qspi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/ti_qspi.c b/drivers/spi/ti_qspi.c index e69ec0d..9a372ad 100644 --- a/drivers/spi/ti_qspi.c +++ b/drivers/spi/ti_qspi.c @@ -45,7 +45,7 @@ DECLARE_GLOBAL_DATA_PTR; #define QSPI_XFER_DONE QSPI_WC #define MM_SWITCH 0x01 #define MEM_CS(cs) ((cs + 1) << 8) -#define MEM_CS_UNSELECT 0xfffff0ff +#define MEM_CS_UNSELECT 0xfffff8ff #define MMAP_START_ADDR_DRA 0x5c000000 #define MMAP_START_ADDR_AM43x 0x30000000 #define CORE_CTRL_IO 0x4a002558 -- 1.7.9.5

2 1

[U-Boot] pull request: u-boot-uniphier/master
by Masahiro Yamada 01 Jul '16

01 Jul '16

Hi Tom, Here are some bug fixes + DT, pinctrl updates. It includes a little more than fixes, but it is self-contained for Uniphier SoCs and I tested this series on all of my boards. So, I hope it should be OK. (And another reason is just personal; I will travel from July 10th, at which the MW will open. I may have poor access to my PC for a while during the MW. So, I'd like to flush out my patches now.) The following changes since commit ff6e1569663eccaf9e582c57cc44568915c2f54b: x86: coreboot: Remove the dummy pch driver (2016-06-29 10:08:15 +0800) are available in the git repository at: git://git.denx.de/u-boot-uniphier.git master for you to fetch changes up to 0b2ecf4dd903bdafdc9a87ba2faf2bc05a9655db: ARM: uniphier: add external IRQ setup code (2016-06-30 23:49:26 +0900) ---------------------------------------------------------------- Masahiro Yamada (12): ARM: uniphier: fix typo "talbe" pinctrl: uniphier: remove wrong pin-mux functions for ProXstream2 pinctrl: uniphier: fix NAND pin-mux setting for PH1-LD11/LD20 pinctrl: uniphier: remove unneeded pin group nand_cs1 ARM: dts: uniphier: sync Device Trees with upstream Linux pinctrl: uniphier: allow to have pinctrl node under syscon node pinctrl: uniphier: split pinctrl driver for PH1-LD11 and PH1-LD20 pinctrl: uniphier: support pin configuration for dedicated pins pinctrl: uniphier: avoid building unneeded pin-mux tables for SPL pinctrl: uniphier: add Ethernet pin-mux settings ARM: dts: uniphier: add AIDET nodes ARM: uniphier: add external IRQ setup code arch/arm/dts/uniphier-common32.dtsi | 22 +++- arch/arm/dts/uniphier-ph1-ld11-ref.dts | 13 +-- arch/arm/dts/uniphier-ph1-ld11.dtsi | 50 +++++++-- arch/arm/dts/uniphier-ph1-ld20-ref.dts | 10 -- arch/arm/dts/uniphier-ph1-ld20.dtsi | 35 +++++-- arch/arm/dts/uniphier-ph1-ld4-ref.dts | 10 -- arch/arm/dts/uniphier-ph1-ld4.dtsi | 7 +- arch/arm/dts/uniphier-ph1-ld6b-ref.dts | 10 -- arch/arm/dts/uniphier-ph1-ld6b.dtsi | 4 +- arch/arm/dts/uniphier-ph1-pro4-ace.dts | 10 -- arch/arm/dts/uniphier-ph1-pro4-ref.dts | 10 -- arch/arm/dts/uniphier-ph1-pro4-sanji.dts | 10 -- arch/arm/dts/uniphier-ph1-pro4.dtsi | 7 +- arch/arm/dts/uniphier-ph1-pro5-4kbox.dts | 10 -- arch/arm/dts/uniphier-ph1-pro5.dtsi | 7 +- arch/arm/dts/uniphier-ph1-sld3.dtsi | 5 + arch/arm/dts/uniphier-ph1-sld8-ref.dts | 10 -- arch/arm/dts/uniphier-ph1-sld8.dtsi | 7 +- arch/arm/dts/uniphier-pinctrl.dtsi | 10 ++ arch/arm/dts/uniphier-proxstream2-gentil.dts | 10 -- arch/arm/dts/uniphier-proxstream2-vodka.dts | 10 -- arch/arm/dts/uniphier-proxstream2.dtsi | 7 +- arch/arm/dts/uniphier-ref-daughter.dtsi | 2 +- arch/arm/mach-uniphier/arm32/lowlevel_init.S | 2 +- arch/arm/mach-uniphier/board_early_init_f.c | 39 +++++++ arch/arm/mach-uniphier/pinctrl/pinctrl-ld20.c | 5 + drivers/pinctrl/uniphier/Kconfig | 10 +- drivers/pinctrl/uniphier/Makefile | 1 + drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 15 ++- drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 107 +++++++++++++++++++ drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 95 +++++++++-------- drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c | 93 +++++++++-------- drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c | 97 +++++++++-------- drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c | 110 +++++++++++-------- drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c | 91 ++++++++-------- drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c | 116 ++++++++++++--------- drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c | 87 +++++++++------- drivers/pinctrl/uniphier/pinctrl-uniphier.h | 23 +++- 38 files changed, 713 insertions(+), 454 deletions(-) create mode 100644 drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c -- Best Regards Masahiro Yamada

1 1

[U-Boot] Missing maintainers
by Simon Glass 01 Jul '16

01 Jul '16

Hi Eddie, A few boards are missing maintainer files - can you please see if someone can send a patch for this? $ ./tools/genboardscfg.py WARNING: no status info for 'evb-rk3036' WARNING: no maintainers for 'evb-rk3036' ... WARNING: no status info for 'kylin-rk3036' WARNING: no maintainers for 'kylin-rk3036' Regards, Simon

2 2

[U-Boot] [PATCH 0/3] armv8: fsl-layerscape: Add LS1046A SoC support
by Gong Qianyu 01 Jul '16

01 Jul '16

The LS1046A processor is built on the QorIQ LS series architecture combining four ARM A72 processor cores with DPAA 1.0 support. [PATCH 1/3] armv8: fsl-layerscape: Add A72 core detection [PATCH 2/3] armv8/fsl_lsch2: Add LS1046A SoC support [PATCH 3/3] armv8/ls1046a: Add Fman support Regards, Qianyu

3 8

[U-Boot] [PATCH v2] powerpc: MPC8544DS: revert typo in I2C offset value
by York Sun 01 Jul '16

01 Jul '16

From: Benjamin Kamath <bkamath(a)spaceflight.com> I2C offset was changed by commit 00f792e0 (added multibus support) from 0x3100 to 0x3000. This typo leads to error when reading SPD from DDR DIMMs. Signed-off-by: Benjamin Kamath <bkamath(a)spaceflight.com> Signed-off-by: York Sun <york.sun(a)nxp.com> --- Changes in v2: Add short summary of commit 00f792e0. include/configs/MPC8544DS.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index b9d97c1..321f71e 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -209,7 +209,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_I2C_FSL #define CONFIG_SYS_FSL_I2C_SPEED 400000 #define CONFIG_SYS_FSL_I2C_SLAVE 0x7F -#define CONFIG_SYS_FSL_I2C_OFFSET 0x3000 +#define CONFIG_SYS_FSL_I2C_OFFSET 0x3100 #define CONFIG_SYS_I2C_NOPROBES { {0, 0x69} } #define CONFIG_SYS_I2C_EEPROM_ADDR 0x57 -- 2.7.4

2 1

Re: [U-Boot] [PATCH] SPL: sunxi: don't force .BSS into DRAM
by Andre Przywara 30 Jun '16

30 Jun '16

Hi Hans, (CC:ing the list, which I accidentally forgot on this first post) On 30/06/16 11:00, Hans de Goede wrote: > Hi Andre, > > On 30-06-16 02:25, Andre Przywara wrote: >> Probably due to some (ill-founded) fear of a large BSS all sunxi boards >> forced their SPL BSS section into DRAM. >> This only works if there is no usage of a .BSS variable before the DRAM >> is initialised. >> The recent inclusion of tiny-printf breaks this assumption (it has two >> variables in .BSS), so any early printf (printing a number) hangs a >> board. >> This in particular breaks the (WIP) Pine64 SPL, which at the moment links >> Allwinner's libdram library, trying to print debug information: >> DRAM:DRAM driver version: V1.0 >> DRAM Type = <hangs> > > Hmm, although 256 bytes is not a lot I would prefer for BSS to stay in > DRAM, esp. since the bss use may grow over time, and the SPL space is quite > small. > > Moreover, given that tiny-printf is specifically meant for use in SPL / > restricted environments and having BSS in DRAM is not unheard of for > other boards, it seems to me like this is something which should really > be fixed in tinyprintf instead. I really don't know. This simple bug has cost me at least two hours yesterday, since it was the rather innocent access to a variable that caused the issue. And if it wouldn't have been for Siarhei to point me in the right direction I'd have spend even more time to find a fix. This whole BSS in DRAM construct is very fragile and not obvious to blame for any bug that you happen to see. For instance we were assuming it to be due to unreliable SRAM C before. Also we *do* a printf very early, which works because it doesn't involve any numbers. And really I think it's quite a stretch to ask the casual programmer to keep in mind that some variables may end up in BSS and this must not happen before DRAM is initialised. So either we find a way to make this break if BSS variables are involved in functions called before DRAM init (by somehow annotating files that are used before or during DRAM init). Or we find other spaces for the BSS in other SRAMs. Like I described here: http://lists.denx.de/pipermail/u-boot/2016-June/259392.html Cheers, Andre. > Have you tried looking into fixing this at the tinyprintf level ? > > Regards, > > Hans > >> >> As it turns out the normal BSS size for sunxi is about 256 Bytes, so we >> can happily remove the symbols and the linker script part that was >> forcing the section into DRAM and let the linker naturally put it into >> SRAM. >> Tested on BananaPi M1 and Pine64(-SPL), also buildman sunxi was happy. >> >> Thanks to Siarhei for providing helpful hints! >> >> Signed-off-by: Andre Przywara <andre.przywara(a)arm.com> >> --- >> arch/arm/cpu/armv7/sunxi/u-boot-spl.lds | 4 +--- >> include/configs/sunxi-common.h | 4 ---- >> 2 files changed, 1 insertion(+), 7 deletions(-) >> >> diff --git a/arch/arm/cpu/armv7/sunxi/u-boot-spl.lds >> b/arch/arm/cpu/armv7/sunxi/u-boot-spl.lds >> index 53f0cbd..a90404f 100644 >> --- a/arch/arm/cpu/armv7/sunxi/u-boot-spl.lds >> +++ b/arch/arm/cpu/armv7/sunxi/u-boot-spl.lds >> @@ -16,8 +16,6 @@ >> */ >> MEMORY { .sram : ORIGIN = CONFIG_SPL_TEXT_BASE,\ >> LENGTH = CONFIG_SPL_MAX_SIZE } >> -MEMORY { .sdram : ORIGIN = CONFIG_SPL_BSS_START_ADDR, \ >> - LENGTH = CONFIG_SPL_BSS_MAX_SIZE } >> >> OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") >> OUTPUT_ARCH(arm) >> @@ -54,5 +52,5 @@ SECTIONS >> *(.bss*) >> . = ALIGN(4); >> __bss_end = .; >> - } > .sdram >> + } > .sram >> } >> diff --git a/include/configs/sunxi-common.h >> b/include/configs/sunxi-common.h >> index 94275a7..e3fe965 100644 >> --- a/include/configs/sunxi-common.h >> +++ b/include/configs/sunxi-common.h >> @@ -75,7 +75,6 @@ >> * since it needs to fit in with the other values. By also #defining it >> * we get warnings if the Kconfig value mismatches. */ >> #define CONFIG_SPL_STACK_R_ADDR 0x2fe00000 >> -#define CONFIG_SPL_BSS_START_ADDR 0x2ff80000 >> #else >> #define SDRAM_OFFSET(x) 0x4##x >> #define CONFIG_SYS_SDRAM_BASE 0x40000000 >> @@ -86,11 +85,8 @@ >> * since it needs to fit in with the other values. By also #defining it >> * we get warnings if the Kconfig value mismatches. */ >> #define CONFIG_SPL_STACK_R_ADDR 0x4fe00000 >> -#define CONFIG_SPL_BSS_START_ADDR 0x4ff80000 >> #endif >> >> -#define CONFIG_SPL_BSS_MAX_SIZE 0x00080000 /* 512 KiB */ >> - >> #if defined(CONFIG_MACH_SUN9I) || defined(CONFIG_MACH_SUN50I) >> /* >> * The A80's A1 sram starts at 0x00010000 rather then at 0x00000000 >> and is >> >

3 2

[U-Boot] Bug in cbfs
by Yaroslav K. 30 Jun '16

30 Jun '16

Hello. Current implementation of cbfs prints incorrect file names. In the file fs/cbfs/cbfs.c there are lines swap_file_header(&header, fileHeader); if (header.offset < sizeof(const struct cbfs_cachenode *) || header.offset > header.len) { file_cbfs_result = CBFS_BAD_FILE; return -1; } newNode->next = NULL; newNode->type = header.type; newNode->data = start + header.offset; newNode->data_length = header.len; name_len = header.offset - sizeof(struct cbfs_cachenode *); newNode->name = (char *)fileHeader + sizeof(struct cbfs_cachenode *); newNode->name_length = name_len; newNode->checksum = header.checksum; Shouldn't sizeof(const struct cbfs_cachenode *) and sizeof(struct cbfs_cachenode *) be replaced with sizeof(struct cbfs_fileheader)? -- Yaroslav

2 1