January 2017 - U-Boot

[U-Boot] [PATCH 1/1] common/image.c: prefixes for binary multiples
by Heinrich Schuchardt 21 Jan '17

21 Jan '17

IEC 80000-13:2008 Quantities and units Part 13: Information science and technology defines the prefixes to use for binary multiples. Instead of writing Data Size: 6726132 Bytes = 6568.49 kB = 6.41 MB in dumpimage we should write Data Size: 6726132 Bytes = 6568.49 KiB = 6.41 MiB. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- common/image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/image.c b/common/image.c index 8c35327745..31317a581e 100644 --- a/common/image.c +++ b/common/image.c @@ -561,7 +561,7 @@ void genimg_print_size(uint32_t size) printf("%d Bytes = ", size); print_size(size, "\n"); #else - printf("%d Bytes = %.2f kB = %.2f MB\n", + printf("%d Bytes = %.2f KiB = %.2f MiB\n", size, (double)size / 1.024e3, (double)size / 1.048576e6); #endif -- 2.11.0

2 1

[U-Boot] [PATCH v2] api: Use hashtable function for API_env_enum
by Emmanuel Vadot 21 Jan '17

21 Jan '17

The current code can loop undefinitly as it doesn't parse correctly the env data. Since the env is an hashtable, use the hashtable function for the API_ENV_ENUM api call. Signed-off-by: Emmanuel Vadot <manu(a)bidouilliste.com> --- Changes in v2: * Explain why the change is needed. api/api.c | 60 +++++++++++++++++++++++++++++++----------------------------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/api/api.c b/api/api.c index 8a1433af78..c368511704 100644 --- a/api/api.c +++ b/api/api.c @@ -495,45 +495,47 @@ static int API_env_set(va_list ap) */ static int API_env_enum(va_list ap) { - int i, n; - char *last, **next; + int i, buflen; + char *last, **next, *s; + ENTRY *match, search; + static char *var; last = (char *)va_arg(ap, unsigned long); if ((next = (char **)va_arg(ap, uintptr_t)) == NULL) return API_EINVAL; - if (last == NULL) - /* start over */ - *next = ((char *)env_get_addr(0)); - else { - *next = last; - - for (i = 0; env_get_char(i) != '\0'; i = n + 1) { - for (n = i; env_get_char(n) != '\0'; ++n) { - if (n >= CONFIG_ENV_SIZE) { - /* XXX shouldn't we set *next = NULL?? */ - return 0; - } - } - - if (envmatch((uchar *)last, i) < 0) - continue; - - /* try to get next name */ - i = n + 1; - if (env_get_char(i) == '\0') { - /* no more left */ - *next = NULL; - return 0; - } - - *next = ((char *)env_get_addr(i)); - return 0; + if (last == NULL) { + var = NULL; + i = 0; + } else { + var = strdup(last); + s = strchr(var, '='); + if (s != NULL) + *s = 0; + search.key = var; + i = hsearch_r(search, FIND, &match, &env_htab, 0); + if (i == 0) { + i = API_EINVAL; + goto done; } } + /* match the next entry after i */ + i = hmatch_r("", i, &match, &env_htab); + if (i == 0) + goto done; + buflen = strlen(match->key) + strlen(match->data) + 2; + var = realloc(var, buflen); + snprintf(var, buflen, "%s=%s", match->key, match->data); + *next = var; return 0; + +done: + free(var); + var = NULL; + *next = NULL; + return i; } /* -- 2.11.0

3 2

[U-Boot] ERROR: can't get kernel image!
by Borisa Jevtic 20 Jan '17

20 Jan '17

Hi guys. I have come across a bulletin that blames the problem (described bellow) on the U-Boot bootloader: https://e2e.ti.com/support/embedded/linux/f/354/t/73788 And this is a typical bootup sequence happening for us: U-Boot 1.3.4 (Feb 28 2012 - 20:31:25) - AT91SAM9260@200 MHz - DRAM: 64 MB NAND: 256 MiB In: serial Out: serial Err: serial Net: smc911x, macb0 main_loop: BootStatus=not_ok main_loop: bootstatus_valid=0 main_loop: bootspace_target=1 main_loop: bootspace_target=1 main_loop: setting bootcmd to bootcmd1=nand read.jffs2 0x22000000 0x000c0000 0x00200000; bootm 0x22000000 main_loop: set BootSpace to 1 Erasing Nand... Erasing at 0xa0000 – 100% complete. Writing to Nand... done main_loop: setting bootargs to bootargs1=mem=64M console=ttyS0,115200 ubi.mtd=6,512 ubi.mtd=9,512 root=ubi0:ipc3-rootfs rootfstype=ubifs lpj=495616 loglevel=8 rw Hit any key to stop autoboot: 0 NAND read: device 0 offset 0xc0000, size 0x200000 Reading data from 0x17d000 – 37% complete.reading NAND page at offset 0x17d800 failed 2097152 bytes read: ERROR 1. 1. Booting kernel from Legacy Image at 22000000 ... Image Name: Angstrom/2.6.27/ipc3 Image Type: ARM Linux Kernel Image (uncompressed) Data Size: 1098224 Bytes = 1 MB Load Address: 20008000 Entry Point: 20008000 Verifying Checksum ... Bad Data CRC ERROR: can't get kernel image! Enter password:RomBOOT > Is there any chance that you guys are aware of this problem and if it is really a u-boot problem? If so, do you know if this has been fixed and and in which version? Thank you. -- Boriša Jevtić

2 1

Re: [U-Boot] [PATCH 0/1] Distroboot support for DE0-nano-SoC board
by Marek Vasut 20 Jan '17

20 Jan '17

On 01/20/2017 05:45 PM, Frank Kunz wrote: Hi, > This patch adds common distribution boot environment variables for > DE0-nanos-SoC board. It disables the watchdog enalbe in uboot since > this is done by the OS. So if the board hangs in U-Boot, with this patch you're doomed. > The MMC boot mode is switched to raw mode, which > gets rid of the 0xa2 special partition. The SOC ROM loader scans for > the SPL in the special partition (partition mode) and from MMC card > sector 0 (raw mode), each for four valid SPLs. So all existing systems will be rendered unbootable if I apply this patch? > When a partition table is > used with raw mode the first SPL must not be written to the MMC and the ROM > loader uses the second SPL. btw if this patch does multiple things, it should be multiple patches, but I'm not too keen on taking it unless the above stuff is sorted out. btw please CC Dinh on Altera patches. > Frank Kunz (1): > socfpga: Distroboot support for DE0-nano-SoC > > configs/socfpga_de0_nano_soc_defconfig | 1 + > include/configs/socfpga_common.h | 2 +- > include/configs/socfpga_de0_nano_soc.h | 47 ++++++++++++++++++++-------------- > 3 files changed, 30 insertions(+), 20 deletions(-) > > -- > 2.11.0 > -- Best regards, Marek Vasut

2 2

[U-Boot] Porting u-boot to a new soc, unsure of standards to follow.
by Marty Plummer 20 Jan '17

20 Jan '17

Greetings, So, out of a desire to learn (or simply pure masochism), I've taken it upon myself to work on mainlining support for a new arm SoC and board, which the vendor SDK only provides source for release 2010.06 (which I had to find via taobao since the vendor in question is not being nice in regards to providing gpl source code from their sdks, but this is besides the point). Having already cobbled together devicetree files for the SoC which has allowed me to boot mainline linux from Linus' tree using the u-boot on the board, I figured I'd take a go at using devicetree in u-boot itself to describe the hardware. Asking about this on irc, I was pointed at the firefly-rk3288 as an example of how to do this. Referencing the source code and the datasheet in question, I started to wrap my head around bootrom, spl, u-boot, and their interactions, and began the task of defining the various system controller registers, using the rockhip code as a guide. However, upon mentioning the structs on irc, I was asked by Marex to not use this method, instead using macros and hex offsets. At this point I've become a bit confused as to how I should proceed. The coding style guide[1] says one should use "a C structure to map out the registers in an I/O region", which appears to be what the rk3288 code does, but is at odds with Marex's request and instruction to use macros. So, I'm asking the ml and whatever powers that be how I should proceed, as I'd really hate to write a bunch of code that has to be changed to such a degree that it may as well be discarded and started from scratch. Regards, Marty Plummer [1] http://www.denx.de/wiki/U-Boot/CodingStyle

2 2

[U-Boot] Uboot: Problem when compiling old Uboot version with new gcc
by Prasant J 20 Jan '17

20 Jan '17

(Sorry for posting about uboot on the eldk mailing list. I am now posting it on Uboot mailing list) Hi, For my Cortex-A5 based ARM Processor (from ADI), I'm trying to compile old uboot (2015.01) release with a new compiler (gcc6). Its giving the following error: arch/arm/cpu/armv7/sc58x/lowlevel_init.S:24: Error: selected processor does not support `vmsr FPEXC,r0' in ARM mode portion of lowlevel_init.S /* * Enable VFP unit */ mrc p15, 0, r0, c1, c0, 2 orr r0, r0, #(0xF << 20) mcr p15, 0, r0, c1, c0, 2 mov r0, #0x40000000 vmsr FPEXC, r0 Compiler arguments (for arm-none-linux-gnueabi-gcc): -D__KERNEL__ -D__UBOOT__ -DCONFIG_SYS_TEXT_BASE=0xC2200000 -D__ASSEMBLY__ -g -D__ARM__ -marm -mno-thumb-interwork -mabi=aapcs-linux -mword-relocations -march=armv7-a -mno-unaligned-access -ffunction-sections -fdata-sections -fno-common -ffixed-r9 -msoft-float -pipe The same compiler arguments when used with old gcc (arm-none-eabi-gcc) version 4.8 compiles this file. Any ideas what I may be doing wrong or any suggestions on how to get past this? Regards, Pj

1 0

[U-Boot] Driver not loaded by SPL
by Felix Brack 20 Jan '17

20 Jan '17

Hello, I have written a pin controller driver for the TI AM335x SOC using U-Boot 2016.11-rc1. I use device tree to configure the board's hardware. The driver runs fine once u-boot.img is loaded. However it does not get loaded by the SPL code. Using the hang() routine for "debugging" I can tell that spl_init() seems to work fine. Even the call to dm_init_and_scan() succeeds. So my question is: what is missing for the driver to be loaded by SPL? If necessary I can provide much more details but it seems I have a fundamental misunderstanding of DM when it comes to SPL, although I believe having understood what dm_init_and_scan() and its parameter pre_reloc_only do. Any hint putting me on the right track would be very much appreciated. regards Felix

1 0

[U-Boot] Please pull u-boot-fsl-qoriq master
by york sun 20 Jan '17

20 Jan '17

Tom, The following changes since commit a705ebc81b7f91bbd0ef7c634284208342901149: Prepare v2017.01 (2017-01-09 11:57:05 -0500) are available in the git repository at: git://git.denx.de/u-boot-fsl-qoriq.git for you to fetch changes up to 5e4a6db8f428cb1f8ced74bc77241144ac0c5b1a: armv8: ls1012a: define esdhc_status_fixup for RDB board (2017-01-18 09:46:52 -0800) ---------------------------------------------------------------- Alison Wang (1): armv8: aarch64: Fix the warning about x1-x3 nonzero issue Hou Zhiqiang (17): configs: ls1021a: enable DT and DM support pci: layerscape: move kernel DT fixup to a separate file kconfig: move FSL_PCIE_COMPAT to platform Kconfig ARMv8/fsl-layerscape: Correct the OCRAM size armv8/fsl_lsch2: Add the OCRAM initialization ARMv8/fsl-layerscape: Enable data coherency between cores in cluster armv8/fsl-lsch2: refactor the clock system initialization armv8/fsl-lsch3: consolidate the clock system initialization pmic: pmic_mc34vr500: Add a driver for the mc34vr500 pmic pmic: pmic_mc34vr500: Add APIs to set/get SWx volt ls1046ardb: cpld: add API for selecting core volt armv8/fsl_lsch2: Add chip power supply voltage setup ls1046ardb: Add support power initialization kconfig: armv8: move armv8 sec_firmware CONFIG_* to Kconfig ARMv8/sec_firmware: relocated and renamed the config FSL_PPA_ARMV8_PSCI kconfig: fsl PPA: move CONFIG_* to Kconfig fsl PPA: enable PPA for ls1043ardb and ls1046ardb Minghuan Lian (15): armv8/layerscape: remove unnecessary function declares dm: pci: return the real controller in pci_bus_to_hose() dm: pci: remove pci_bus_to_hose(0) calling arm: ls1021a: add PCIe dts node arm: ls1012a: add PCIe dts node armv8: ls1043a: add PCIe dts node armv8: ls1046a: add PCIe dts node armv8: ls2080a: add PCIe dts node pci: layerscape: add pci driver based on DM arm: ls1021a: Enable PCIe in defconfigs arm: ls1012a: Enable PCIe and E1000 in defconfigs armv8: ls1043a: Enable PCIe and E1000 in defconfigs armv8: ls1046a: Enable PCIe and E1000 in defconfigs armv8: ls2080a: Enable PCIe in defconfigs pci: layerscape: remove unnecessary legacy code Mingkai Hu (1): armv8: Enable CPUECTLR.SMPEN for coherency Prabhakar Kushwaha (1): arm: layerscape: Enable UUID & GPT partition for NXP's ARM SoC Priyanka Jain (1): armv8: fsl-layerscape, ccn504: Set forced-order mode in RNI-6, RNI-20 Tang Yuantian (3): armv8: ls1012: added usb nodes in dts armv8: ls1012: Enable CONFIG_DM_USB in defconfigs armv8: fsl-lsch3: enable snoopable sata read and write Udit Agarwal (2): SECURE_BOOT: Update bootscript and its hdr addresses LS2080A: Add validation of MC & DPC images. Wenbin Song (2): armv8/ls1043a: fixup GIC offset for ls1043a rev1 armv8/fsl-layerscape: fdt: fixup LS1043A rev1 MSI node Yangbo Lu (7): mmc: fsl_esdhc: make GPIO support optional mmc: fsl_esdhc: add 'fsl, esdhc' into of_match table armv8: ls1012a: add eSDHC nodes configs: ls1012a: enable driver model for eSDHC mmc: fsl_esdhc: move 'status' property fixup into a weak function armv8: ls1012a: define esdhc_status_fixup for QDS board armv8: ls1012a: define esdhc_status_fixup for RDB board York Sun (1): armv8: fsl-layerscape: Fix SECURE_BOOT config jerry.huang(a)nxp.com (1): fsl/usb: enable usb feature for ls1046ardb arch/arm/Kconfig | 1 + arch/arm/cpu/armv7/ls102xa/Kconfig | 8 + arch/arm/cpu/armv8/Kconfig | 59 ++ arch/arm/cpu/armv8/Makefile | 2 +- arch/arm/cpu/armv8/cpu-dt.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 132 ++- arch/arm/cpu/armv8/fsl-layerscape/Makefile | 2 +- arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 5 +- arch/arm/cpu/armv8/fsl-layerscape/fdt.c | 220 ++++- .../cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c | 272 ++++++ .../arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c | 69 +- .../arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c | 28 +- arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S | 146 ++- arch/arm/cpu/armv8/fsl-layerscape/soc.c | 91 ++ arch/arm/cpu/armv8/sec_firmware.c | 2 +- arch/arm/cpu/armv8/sec_firmware_asm.S | 12 +- arch/arm/cpu/armv8/start.S | 19 +- arch/arm/cpu/armv8/transition.S | 22 +- arch/arm/dts/fsl-ls1012a.dtsi | 46 + arch/arm/dts/fsl-ls1043a.dtsi | 46 + arch/arm/dts/fsl-ls1046a.dtsi | 49 ++ arch/arm/dts/fsl-ls2080a.dtsi | 60 ++ arch/arm/dts/ls1021a.dtsi | 31 + arch/arm/include/asm/arch-fsl-layerscape/config.h | 33 +- arch/arm/include/asm/arch-fsl-layerscape/cpu.h | 8 +- arch/arm/include/asm/arch-fsl-layerscape/fdt.h | 4 - .../include/asm/arch-fsl-layerscape/fsl_serdes.h | 8 + .../include/asm/arch-fsl-layerscape/immap_lsch2.h | 4 +- .../include/asm/arch-fsl-layerscape/immap_lsch3.h | 9 +- arch/arm/include/asm/arch-fsl-layerscape/soc.h | 4 + arch/arm/include/asm/armv8/sec_firmware.h | 2 +- arch/arm/include/asm/fsl_secure_boot.h | 12 +- arch/arm/include/asm/system.h | 8 +- arch/arm/lib/bootm-fdt.c | 2 +- arch/arm/lib/bootm.c | 10 +- arch/arm/lib/psci-dt.c | 2 +- arch/arm/mach-rmobile/lowlevel_init_gen3.S | 8 +- board/freescale/common/Makefile | 1 + board/freescale/common/mc34vr500.c | 95 ++ board/freescale/ls1012aqds/ls1012aqds.c | 28 + board/freescale/ls1012ardb/ls1012ardb.c | 38 + board/freescale/ls1046ardb/cpld.c | 9 + board/freescale/ls1046ardb/cpld.h | 1 + board/freescale/ls1046ardb/ls1046ardb.c | 34 + cmd/bootefi.c | 2 +- configs/ls1012afrdm_qspi_defconfig | 6 + configs/ls1012aqds_qspi_defconfig | 9 +- configs/ls1012ardb_qspi_defconfig | 9 +- configs/ls1021aiot_qspi_defconfig | 4 + configs/ls1021aiot_sdcard_defconfig | 4 + configs/ls1021aqds_ddr4_nor_defconfig | 5 +- configs/ls1021aqds_ddr4_nor_lpuart_defconfig | 5 +- configs/ls1021aqds_nand_defconfig | 8 +- configs/ls1021aqds_nor_SECURE_BOOT_defconfig | 7 +- configs/ls1021aqds_nor_defconfig | 5 +- configs/ls1021aqds_nor_lpuart_defconfig | 5 +- configs/ls1021aqds_qspi_defconfig | 5 +- configs/ls1021aqds_sdcard_ifc_defconfig | 5 +- configs/ls1021aqds_sdcard_qspi_defconfig | 5 +- configs/ls1021atwr_nor_SECURE_BOOT_defconfig | 7 +- configs/ls1021atwr_nor_defconfig | 5 +- configs/ls1021atwr_nor_lpuart_defconfig | 5 +- configs/ls1021atwr_qspi_defconfig | 5 +- .../ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 7 +- configs/ls1021atwr_sdcard_ifc_defconfig | 8 +- configs/ls1021atwr_sdcard_qspi_defconfig | 5 +- configs/ls1043aqds_defconfig | 7 +- configs/ls1043aqds_lpuart_defconfig | 7 +- configs/ls1043aqds_nand_defconfig | 7 +- configs/ls1043aqds_nor_ddr3_defconfig | 7 +- configs/ls1043aqds_qspi_defconfig | 7 +- configs/ls1043aqds_sdcard_ifc_defconfig | 7 +- configs/ls1043aqds_sdcard_qspi_defconfig | 7 +- configs/ls1043ardb_SECURE_BOOT_defconfig | 8 +- configs/ls1043ardb_defconfig | 8 +- configs/ls1043ardb_nand_defconfig | 7 +- configs/ls1043ardb_sdcard_defconfig | 7 +- configs/ls1046aqds_defconfig | 6 + configs/ls1046aqds_nand_defconfig | 6 + configs/ls1046aqds_qspi_defconfig | 6 + configs/ls1046aqds_sdcard_ifc_defconfig | 6 + configs/ls1046aqds_sdcard_qspi_defconfig | 6 + configs/ls1046ardb_emmc_defconfig | 6 + configs/ls1046ardb_qspi_defconfig | 7 + configs/ls1046ardb_sdcard_defconfig | 6 + configs/ls2080aqds_SECURE_BOOT_defconfig | 6 +- configs/ls2080aqds_defconfig | 5 +- configs/ls2080aqds_nand_defconfig | 5 +- configs/ls2080aqds_qspi_defconfig | 5 +- configs/ls2080ardb_SECURE_BOOT_defconfig | 6 +- configs/ls2080ardb_defconfig | 5 +- configs/ls2080ardb_nand_defconfig | 5 +- drivers/mmc/fsl_esdhc.c | 32 +- drivers/pci/Kconfig | 8 + drivers/pci/Makefile | 1 + drivers/pci/pci_common.c | 17 +- drivers/pci/pci_compat.c | 2 +- drivers/pci/pcie_layerscape.c | 979 ++++++++------------- drivers/pci/pcie_layerscape.h | 140 +++ drivers/pci/pcie_layerscape_fixup.c | 187 ++++ drivers/power/pmic/Kconfig | 7 + drivers/power/pmic/Makefile | 1 + drivers/power/pmic/pmic_mc34vr500.c | 32 + include/configs/ls1012a_common.h | 6 +- include/configs/ls1012afrdm.h | 5 + include/configs/ls1012aqds.h | 21 +- include/configs/ls1012ardb.h | 21 +- include/configs/ls1021aiot.h | 22 +- include/configs/ls1021aqds.h | 20 +- include/configs/ls1021atwr.h | 20 +- include/configs/ls1043a_common.h | 21 +- include/configs/ls1043aqds.h | 4 + include/configs/ls1043ardb.h | 14 +- include/configs/ls1046a_common.h | 3 +- include/configs/ls1046aqds.h | 4 + include/configs/ls1046ardb.h | 33 +- include/configs/ls2080a_common.h | 27 +- include/configs/ls2080aqds.h | 27 +- include/configs/ls2080ardb.h | 35 +- include/fsl_ddr_sdram.h | 1 + include/linux/usb/xhci-fsl.h | 2 +- include/power/mc34vr500_pmic.h | 175 ++++ scripts/config_whitelist.txt | 1 - 123 files changed, 2834 insertions(+), 969 deletions(-) create mode 100644 board/freescale/common/mc34vr500.c create mode 100644 drivers/pci/pcie_layerscape.h create mode 100644 drivers/pci/pcie_layerscape_fixup.c create mode 100644 drivers/power/pmic/pmic_mc34vr500.c create mode 100644 include/power/mc34vr500_pmic.h Thanks. York

2 1

[U-Boot] [PATCH RFC] common/image: Allow initrd_high & fdt_high to have special case no_reloc
by Tuomas Tynkkynen 20 Jan '17

20 Jan '17

The documented way of disabling relocation of the initrd or FDT is setting initrd_high or fdt_high to 0xffffffff. However, that is actually wrong on 64-bit platforms, where 0xffffffffffffffff needs to be used. This is somewhat painful: - Some platforms (e.g. Raspberry Pi) have a common file setting fdt_high or initrd_high to 0xffffffff that is included in both 32-bit builds (RPi 1, 2) and 64-bit builds (RPi 3). Those are currently not doing the right thing in 64-bit builds, and it wouldn't be nice to #ifdef around that. - Typing the 16 consecutive f's in 0xffffffffffffffff is not very pleasant. To fix these, make the initrd_high and fdt_high handling accept a special value "no_reloc" that does the right thing independent of the bitness. The old values keep working for compatibility. Signed-off-by: Tuomas Tynkkynen <tuomas(a)tuxera.com> --- Only compile-tested so far. README | 18 +++++++++++------- common/image-fdt.c | 2 +- common/image.c | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/README b/README index 7e0dd35f93..e5e10e46ca 100644 --- a/README +++ b/README @@ -4940,12 +4940,14 @@ List of environment variables (most likely not complete): of the 704 MB low memory, so that Linux kernel can access it during the boot procedure. - If this is set to the special value 0xFFFFFFFF then - the fdt will not be copied at all on boot. For this - to work it must reside in writable memory, have - sufficient padding on the end of it for u-boot to - add the information it needs into it, and the memory - must be accessible by the kernel. + If this is set to "no_reloc" or to the largest + possible address (0xFFFFFFFF on 32-bit platforms, + 0xFFFFFFFFFFFFFFFF on 64-bit platforms), the fdt + will not be copied at all on boot. For this to work + it must reside in writable memory, have sufficient + padding on the end of it for u-boot to add the + information it needs into it, and the memory must + be accessible by the kernel. fdtcontroladdr- if set this is the address of the control flattened device tree used by U-Boot when CONFIG_OF_CONTROL is @@ -4978,7 +4980,9 @@ List of environment variables (most likely not complete): setenv initrd_high 00c00000 - If you set initrd_high to 0xFFFFFFFF, this is an + If you set initrd_high to "no_reloc" or to the largest + possible address (0xFFFFFFFF on 32-bit platforms, + 0xFFFFFFFFFFFFFFFF on 64-bit platforms), this is an indication to U-Boot that all addresses are legal for the Linux kernel, including addresses in flash memory. In this case U-Boot will NOT COPY the diff --git a/common/image-fdt.c b/common/image-fdt.c index e7540be8d6..3e3113b51c 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -136,7 +136,7 @@ int boot_relocate_fdt(struct lmb *lmb, char **of_flat_tree, ulong *of_size) if (fdt_high) { void *desired_addr = (void *)simple_strtoul(fdt_high, NULL, 16); - if (((ulong) desired_addr) == ~0UL) { + if (((ulong) desired_addr) == ~0UL || !strcmp(fdt_high, "no_reloc")) { /* All ones means use fdt in place */ of_start = fdt_blob; lmb_reserve(lmb, (ulong)of_start, of_len); diff --git a/common/image.c b/common/image.c index 8c35327745..35c67856c5 100644 --- a/common/image.c +++ b/common/image.c @@ -1229,7 +1229,7 @@ int boot_ramdisk_high(struct lmb *lmb, ulong rd_data, ulong rd_len, * turning the "load high" feature off. This is intentional. */ initrd_high = simple_strtoul(s, NULL, 16); - if (initrd_high == ~0) + if (initrd_high == ~0 || !strcmp(s, "no_reloc")) initrd_copy_to_ram = 0; } else { initrd_high = getenv_bootm_mapsize() + getenv_bootm_low(); -- 2.11.0

2 1

[U-Boot] [PATCH 1/4] mmc: meson: add MMC nodes to Meson GXBB DT
by Heiner Kallweit 20 Jan '17

20 Jan '17

Copied from amlogic/meson-gx.dtsi on Linux with the interrupt definition removed. Signed-off-by: Heiner Kallweit <hkallweit1(a)gmail.com> --- arch/arm/dts/meson-gxbb.dtsi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/arch/arm/dts/meson-gxbb.dtsi b/arch/arm/dts/meson-gxbb.dtsi index e502c24..3f357b4 100644 --- a/arch/arm/dts/meson-gxbb.dtsi +++ b/arch/arm/dts/meson-gxbb.dtsi @@ -329,6 +329,24 @@ #address-cells = <2>; #size-cells = <2>; ranges = <0x0 0x0 0x0 0xd0000000 0x0 0x200000>; + + sd_emmc_a: mmc@70000 { + compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc"; + reg = <0x0 0x70000 0x0 0x2000>; + status = "disabled"; + }; + + sd_emmc_b: mmc@72000 { + compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc"; + reg = <0x0 0x72000 0x0 0x2000>; + status = "disabled"; + }; + + sd_emmc_c: mmc@74000 { + compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc"; + reg = <0x0 0x74000 0x0 0x2000>; + status = "disabled"; + }; }; ethmac: ethernet@c9410000 { -- 2.11.0

1 0