July 2016 - U-Boot

[U-Boot] OCOTEA Board
by pc.ramachandra 21 Jul '16

21 Jul '16

Hello everyone, We are porting U-Boot to a custom PPC440GX board and I was hoping to use the ocotea port of U-Boot as a starting point. It would be most helpful if I had a user manual for the ocotea with specific details about I/O devices, memory maps... Unfortunately, IBM's support site does not provide any technical literature for this board. A searched of the AMCC website turned up nothing - they had recently acquired the Intellectual Property and a Portfolio for the PPC4xx. Could anyone suggest where I can find the necessary technical details for the ocotea, to assist with my port? Best Regards, Ramachandra -- View this message in context: http://u-boot.10912.n7.nabble.com/OCOTEA-Board-tp261635.html Sent from the U-Boot mailing list archive at Nabble.com.

1 0

Re: [U-Boot] Booting armv8 Kernel on UBoot
by Rajkumar Ramasamy 21 Jul '16

21 Jul '16

Hi, I did a few more debugging and wanted to share few more information which are below: 1) I think QEMU does support EL2, because, the following code is working fine. mov \xreg1, #0x33ff msr cptr_el2, \xreg1 /* Disable coprocessor traps to EL2 */ 2) The machine is still in EL3, when its trying to write to SP_EL2. As SP_EL2 can be written from EL3 or EL2, I think there is no permission violation happening due to this. mrs \xreg, CurrentEL /* xreg is 0xc after this line*/ mov \xreg1, sp msr sp_el2, \xreg1 /* Migrate SP */ Please correct me if I am wrong. ------- Original Message ------- Sender : Rajkumar Ramasamy<rajkumar.r(a)samsung.com> Technical Lead/SRI-Bangalore-IoTivity/Samsung Electronics Date : Jul 21, 2016 09:41 (GMT+05:30) Title : Booting armv8 Kernel on UBoot Hi, I am trying to boot ARMv8 Linux kernel using U-Boot. I have built the latest mainline kernel and U-Boot for aarch64 using defconfig. I am testing this build on QEMU V2.6.0. I have loaded the Image file at 0x80080000 "loaded file /home/shingu/workspace/linux/linux_mainline_aarch64/arch/arm64/boot/Image from 80080000 to 80B175FF, 00A97600 bytes" Just before transfering the control to the kernel, U-Boot is trying to switch the exception level to EL2 from EL3, since I have "-machine secure=on" in QEMU parameters. As soon as the stack pointer is migrated, ( mov x0, sp; msr sp_el2, x0) there is an exception occurring, [transferring control to arch/arm/cpu/armv8/exceptions.S:102] which is aborting the boot process with following message: "Synchronous Abort" handler, esr 0x02000000 ELR: fef7caa4 LR: fef7d60c x0 : 00000000fe6fa820 x1 : 0000000000000000 x2 : 00000000fef94a88 x3 : 0000000000000001 x4 : 00000000fe6fa4e0 x5 : 0000000000000020 x6 : ffffff80ffffffc8 x7 : 0000000000000000 x8 : 00000000fe6fa6e0 x9 : 0000000000000002 x10: 00000000fe6fa55b x11: 0000000000000002 x12: 0000000000000002 x13: 00000000ffffffff x14: 0000000083006fff x15: 00000000fef7c8e4 x16: 00000000fef7cb68 x17: 0000000000000000 x18: 00000000fe6fae00 x19: 00000000fefb7b40 x20: 0000000000000000 x21: 0000000080080000 x22: 0000000000000003 x23: 00000000fe6fe058 x24: 0000000000000000 x25: 00000000fefb0918 x26: 0000000000000000 x27: 00000000fef7d6d8 x28: 00000000fe6fe080 x29: 00000000fef7d5ec Resetting CPU ... resetting ... Can anyone please help me to understand what I am doing wrong? The total process is in the following code: [ http://git.denx.de/?p=u-boot.git;a=blob;f=arch/arm/cpu/armv8/transition.S#l…, http://git.denx.de/?p=u-boot.git;a=blob;f=arch/arm/include/asm/macro.h#138] Have a pleasant day! :) With Thanks and Regards, Rajkumar R Have a pleasant day! :) With Thanks and Regards, Rajkumar R

1 0

[U-Boot] [PATCH v5 0/8] ARMv7: PSCI: add PSCI v1.0 support
by macro.wave.z＠gmail.com 21 Jul '16

21 Jul '16

From: Hongbo Zhang <hongbo.zhang(a)nxp.com> v5 changes: - Give up fixing the potential bug of PSCI stack overlap with secure text end when there is more CPUs in system. Because I just want to keep this series as simple as it could be: adding basic PSCI v1.0 support and adding more PSCI v1.0 implements of our platform. While too compplicated patches in assembly language won't call for effective reviews, even I think there is potential bug of PSCI stack, let's fix it in sepetated patch later. - Move the patch of factoring out psci_cpu_on_common to earlier place 2/8, so that the following patches can only update the psci_cpu_on_common instead of touching each platform's psci_cpu_on, this reduces patches size obviously and make it easier for review. v4 changes: - since there is already PSCI v0.2 function IDs definition merged in 5a07abb, I give up my previous patches 1/11 and 2/11, and move previous 7/11 "ARMv7: PSCI: add PSCI v1.0 functions skeleton" as current first one 1/9 - accept Andre's comment to add the missed "arm,psci-0,2" into compatible string v3 changes: - patch 3/11, re-init the stack pointer to address like start of page instead of page end, because for ARM push operation, the stack pointer is encreased before storing data. - patch 10/11, delete the previous un-implemented cpu_suspend function for ls1 platform, because there is default blank functions for all those are not implemented in specific platform. v2 changes: - re-organize psci_cpu_on_common, this code should be called by each platform's psci_cpu_on, should not be a function calling each psci_cpu_on, all related functions are updated due to this change - update some registers usage, e.g. if r10 is used without push/pop, u-boot cannot launch rt-kernel - update some comments to be clearer, re-organize all patches for easier review - add patch to check already_on or on_pending for LS102XA This patch set contains two parts: ARMv7 PSCI common framework: fix some issues and add v1.0 support NXP (was Freescale) LS102XA: codes enhancement and add v1.0 implementation And this patch set was initially created by Dongsheng Wang. Hongbo Zhang (8): ARMv7: PSCI: add PSCI v1.0 functions skeleton ARMv7: PSCI: factor out reusable psci_cpu_on_common ARMv7: PSCI: update the place of saving target PC ARMv7: PSCI: add codes to save context ID for CPU_ON ARMv7: PSCI: ls102xa: check target CPU ID before further operations ARMv7: PSCI: ls102xa: check ALREADY_ON or ON_PENDING for CPU_ON ARMv7: PSCI: ls102xa: add more PSCI v1.0 functions implemention ARMv7: PSCI: ls102xa: move secure text section into OCRAM arch/arm/cpu/armv7/ls102xa/psci.S | 169 +++++++++++++++++++++++++++-- arch/arm/cpu/armv7/mx7/psci.S | 5 +- arch/arm/cpu/armv7/nonsec_virt.S | 7 ++ arch/arm/cpu/armv7/psci.S | 99 ++++++++++++++++- arch/arm/cpu/armv7/sunxi/psci_sun6i.S | 5 +- arch/arm/cpu/armv7/sunxi/psci_sun7i.S | 5 +- arch/arm/cpu/armv7/virt-dt.c | 10 +- arch/arm/include/asm/arch-ls102xa/config.h | 3 +- arch/arm/include/asm/psci.h | 31 ++++++ arch/arm/mach-tegra/psci.S | 5 +- board/freescale/ls1021aqds/Makefile | 1 + board/freescale/ls1021aqds/psci.S | 36 ++++++ board/freescale/ls1021atwr/Makefile | 1 + board/freescale/ls1021atwr/psci.S | 28 +++++ include/configs/ls1021aqds.h | 3 + include/configs/ls1021atwr.h | 3 + 16 files changed, 383 insertions(+), 28 deletions(-) create mode 100644 board/freescale/ls1021aqds/psci.S create mode 100644 board/freescale/ls1021atwr/psci.S -- 2.1.4

6 33

[U-Boot] Booting armv8 Kernel on UBoot
by Rajkumar Ramasamy 21 Jul '16

21 Jul '16

Hi, I am trying to boot ARMv8 Linux kernel using U-Boot. I have built the latest mainline kernel and U-Boot for aarch64 using defconfig. I am testing this build on QEMU V2.6.0. I have loaded the Image file at 0x80080000 "loaded file /home/shingu/workspace/linux/linux_mainline_aarch64/arch/arm64/boot/Image from 80080000 to 80B175FF, 00A97600 bytes" Just before transfering the control to the kernel, U-Boot is trying to switch the exception level to EL2 from EL3, since I have "-machine secure=on" in QEMU parameters. As soon as the stack pointer is migrated, ( mov x0, sp; msr sp_el2, x0) there is an exception occurring, [transferring control to arch/arm/cpu/armv8/exceptions.S:102] which is aborting the boot process with following message: "Synchronous Abort" handler, esr 0x02000000 ELR: fef7caa4 LR: fef7d60c x0 : 00000000fe6fa820 x1 : 0000000000000000 x2 : 00000000fef94a88 x3 : 0000000000000001 x4 : 00000000fe6fa4e0 x5 : 0000000000000020 x6 : ffffff80ffffffc8 x7 : 0000000000000000 x8 : 00000000fe6fa6e0 x9 : 0000000000000002 x10: 00000000fe6fa55b x11: 0000000000000002 x12: 0000000000000002 x13: 00000000ffffffff x14: 0000000083006fff x15: 00000000fef7c8e4 x16: 00000000fef7cb68 x17: 0000000000000000 x18: 00000000fe6fae00 x19: 00000000fefb7b40 x20: 0000000000000000 x21: 0000000080080000 x22: 0000000000000003 x23: 00000000fe6fe058 x24: 0000000000000000 x25: 00000000fefb0918 x26: 0000000000000000 x27: 00000000fef7d6d8 x28: 00000000fe6fe080 x29: 00000000fef7d5ec Resetting CPU ... resetting ... Can anyone please help me to understand what I am doing wrong? The total process is in the following code: [ http://git.denx.de/?p=u-boot.git;a=blob;f=arch/arm/cpu/armv8/transition.S#l…, http://git.denx.de/?p=u-boot.git;a=blob;f=arch/arm/include/asm/macro.h#138] Have a pleasant day! :) With Thanks and Regards, Rajkumar R

1 0

[U-Boot] [PATCH] armv8/fsl-layerscape: add IFC fixup for LS1043A with QSPI enabled
by Gong Qianyu 21 Jul '16

21 Jul '16

QSPI and IFC are pin-multiplexed on LS1043A. So if QSPI is enabled, IFC should be disabled. But just disable IFC driver in LS1043A Linux is not enough because mdio-mux will access IFC address space -- actually it accesses FPGA which is connected to IFC CS3. So disable the whole IFC node in Linux device tree. Signed-off-by: Gong Qianyu <Qianyu.Gong(a)nxp.com> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c index 4e4861d..5bb3048 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c @@ -204,4 +204,11 @@ void ft_cpu_setup(void *blob, bd_t *bd) #ifdef CONFIG_FSL_LSCH3 fdt_fixup_smmu(blob); #endif + +#ifdef CONFIG_LS1043A +#ifdef CONFIG_FSL_QSPI + do_fixup_by_compat(blob, "fsl,ifc", + "status", "disabled", 8 + 1, 1); +#endif +#endif } -- 2.1.0.27.g96db324

5 14

[U-Boot] fatwrite issue in sub-directories
by Nicolas le bayon 21 Jul '16

21 Jul '16

Hi all, With a quite old u-boot release (October 2015 more or less), I has some different issues around fatwrite operations. I realigned a few things around FAT with latest release, and now I observe only one issue. Maybe this has been discussed here before, I searched but no success. I'd like to save a file on an external device (sd card or usb stick), but not on the root, in a sub-directory. I made the implementation with EXT4 and it works fine. But no way (for the moment) with FAT. Here is the behaviour, let's imagine the device contains only a "mydir" directory. > fatls <device> mydir/ > fatwrite <device> <addr> myfile.txt <filesize> > fatls <device> mydir/ myfile.txt > fatwrite <device> <addr> mydir/myfile2.txt <filesize> > fatls <device> mydir/ myfile.txt mydir/myfile2.txt In fact, data is stored in a file strangely named with a '/' character. And when I put the device back on my Linux PC, I can see myfile.txt, nothing special in mydir directory, and no "mydir/myfile2.txt" file. Does someone have already observed this? Best Regards Nicolas

2 2

[U-Boot] [PATCH] armv8/ls1043a: Add MTD partition scheme
by Wenbin Song 20 Jul '16

20 Jul '16

Add and share the the MTD partition scheme with kernel by defualt bootargs. And add the "mtdparts" env. Signed-off-by: Wenbin Song <wenbin.song(a)nxp.com> --- include/configs/ls1043a_common.h | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index fd243b1..6964873 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -236,6 +236,21 @@ #define CONFIG_HWCONFIG #define HWCONFIG_BUFFER_SIZE 128 +#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) +#define MTDPARTS_DEFAULT "mtdparts=spi0.0:1m(uboot)," \ + "5m(kernel),1m(dtb),9m(file_system)" +#else +#define MTDPARTS_DEFAULT "mtdparts=60000000.nor:1m(nor_bank0_rcw)," \ + "1m(nor_bank0_uboot),1m(nor_bank0_uboot_env)," \ + "1m(nor_bank0_fman_uconde),40m(nor_bank0_fit)," \ + "1m(nor_bank4_rcw),1m(nor_bank4_uboot)," \ + "1m(nor_bank4_uboot_env),1m(nor_bank4_fman_ucode)," \ + "40m(nor_bank4_fit);7e800000.flash:" \ + "1m(nand_uboot),1m(nand_uboot_env)," \ + "20m(nand_fit);spi0.0:1m(uboot)," \ + "5m(kernel),1m(dtb),9m(file_system)" +#endif + /* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ @@ -248,10 +263,13 @@ "kernel_start=0x61100000\0" \ "kernel_load=0xa0000000\0" \ "kernel_size=0x2800000\0" \ - "console=ttyAMA0,38400n8\0" + "console=ttyAMA0,38400n8\0" \ + "mtdparts=" MTDPARTS_DEFAULT "\0" #define CONFIG_BOOTARGS "console=ttyS0,115200 root=/dev/ram0 " \ - "earlycon=uart8250,mmio,0x21c0500" + "earlycon=uart8250,mmio,0x21c0500 " \ + MTDPARTS_DEFAULT + #define CONFIG_BOOTCOMMAND "cp.b $kernel_start $kernel_load " \ "$kernel_size && bootm $kernel_load" #define CONFIG_BOOTDELAY 10 -- 2.1.0.27.g96db324

3 11

[U-Boot] [PATCH v3 0/9] Secure Boot by Authenticating/Decrypting SPL FIT blobs
by Andreas Dannenberg 20 Jul '16

20 Jul '16

This is an updated version of a patch series that introduces a generic way to optionally post-process blobs as they get extracted by the SPL from the u-boot.img FIT image, and uses this scheme to perform some authentication/ decryption related processing on TI's high-secure (HS) SoC variants. For additional background please see here [1]. Changes PATCH v3->PATCH v3: - Added Kconfig option help explaining the process of customizing the SPL FIT post-processing (Simon's feecback) - Added new Reviewed-by: tags from Tom and Simon - Rebased on latest U-Boot upstream/master and re-tested Changes PATCH->PATCH v2: - Added some glue code to suppress SPL "Authentication passed" log messages in case of UART/Y-Modem boot (thanks Lokesh) - Dropped the .NOTPARALLEL make hack when building the 'dtbs' target. Now, we rely on Yamada-san's patch [2] that fixes this on a more global scale - Fixed some typos (thanks Yamada-san) - Turned the __weak function call for inserting a post-processing function into a Kconfig option (thanks Simon). Also enabled that Kconfig option on applicable AM43xx HS, AM57xx HS, DRA7xx HS, and DRA72xx HS device variants defconfig files (note there is a dependency on [3] which renames the AM437x HS defconfig file) - Introduced a new header file omap_sec_common.h for commom security API as using omap_common.h as done previously led to issues trying to use this file on AM43xx type devices. This device family (and AM335x as well) is not supported by omap_common.h, and trying to include this file into AM43xx board files leads to all kinds of issues (the registers and definitions are simply not compatible) - Re-ordered the series so that the Kconfig option is introduced after all of the building blocks have been put into place (generic infrastructure and the TI-specific implementation). - Minor readme update to account for the new Kconfig option Changes RFC->PATCH: - Update of README.ti-secure - Unification of some of the secure ROM API call stuff between AM43xx and OMAP5-based platforms by moving those into common files - Replacement of puts() with printf() - Minor build simplification/cleanup - Addition of "Reviewed-by:" comments for files that were pretty much carried over from the RFC as-is - Addition of AM437x HS device build support (was missing in RFC) - Removal of some redundant conditional compile directives - Rebased on upstream U-Boot commit "Prepare v2016.07-rc2" -- Andreas Dannenberg Texas Instruments Inc [1] http://lists.denx.de/pipermail/u-boot/2016-June/258716.html [2] http://lists.denx.de/pipermail/u-boot/2016-June/258912.html [3] http://lists.denx.de/pipermail/u-boot/2016-June/258896.html Andreas Dannenberg (5): arm: omap-common: add secure rom call API for secure devices arm: omap-common: secure ROM signature verify API arm: omap-common: Update to generate secure U-Boot FIT blob arm: omap5: add U-Boot FIT signing and SPL image post-processing doc: Update info on using secure devices from TI Daniel Allred (3): arm: cache: add missing dummy functions for when dcache disabled arm: omap-common: add secure smc entry spl: fit: add support for post-processing of images Madan Srinivas (1): arm: am4x: add U-Boot FIT signing and SPL image post-processing Kconfig | 14 ++ arch/arm/cpu/armv7/am33xx/config.mk | 1 + arch/arm/cpu/armv7/cache_v7.c | 8 ++ arch/arm/cpu/armv7/omap-common/Makefile | 2 + arch/arm/cpu/armv7/omap-common/config_secure.mk | 75 ++++++++-- arch/arm/cpu/armv7/omap-common/lowlevel_init.S | 45 ++++-- arch/arm/cpu/armv7/omap-common/sec-common.c | 139 +++++++++++++++++++ arch/arm/cpu/armv7/omap5/config.mk | 3 + arch/arm/include/asm/omap_common.h | 6 + arch/arm/include/asm/omap_sec_common.h | 30 ++++ board/ti/am43xx/board.c | 8 ++ board/ti/am57xx/board.c | 8 ++ board/ti/dra7xx/evm.c | 9 ++ common/spl/spl_fit.c | 21 ++- configs/am43xx_hs_evm_defconfig | 1 + configs/am57xx_hs_evm_defconfig | 1 + configs/dra7xx_hs_evm_defconfig | 1 + doc/README.ti-secure | 177 ++++++++++++++++-------- include/image.h | 17 +++ 19 files changed, 484 insertions(+), 82 deletions(-) create mode 100644 arch/arm/cpu/armv7/omap-common/sec-common.c create mode 100644 arch/arm/include/asm/omap_sec_common.h -- 2.6.4

3 25

[U-Boot] [PATCH v4 0/9] LS2080ARDB: Enable EFI boot support
by Alexander Graf 20 Jul '16

20 Jul '16

We now have EFI support in U-Boot which worked out of the box on all systems that I tried it on so far. Except for the LS2080ARDB. With this patch set I can successfully boot grub2 and Linux from there on such a system - even using PXE. v3 -> v4: - Add CONFIG_CMD_FS_GENERIC to defconfig - Move code into generic quiesce weak function - Exit device for real when going to Linux - Only apply DPL if we have something to apply - New: armv8: ls2080a: Declare spin tables as reserved for efi loader - New: efi_loader: Allow boards to implement get_time and reset_system - New: armv8: fsl-layerscape: Add support for efi_loader RTS reset - New: efi_loader: Declare secure memory as reserved - New: efi_loader: Allow bouncing for network Alexander Graf (9): ls2080: Exit dpaa only right before exiting U-Boot efi_loader: AArch64: Run EFI payloads in EL2 if U-Boot runs in EL3 ls2080ardb: Reserve DP-DDR RAM ls2080ardb: Convert to distro boot armv8: ls2080a: Declare spin tables as reserved for efi loader efi_loader: Allow boards to implement get_time and reset_system armv8: fsl-layerscape: Add support for efi_loader RTS reset efi_loader: Declare secure memory as reserved efi_loader: Allow bouncing for network arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 33 +++++++++- arch/arm/cpu/armv8/fsl-layerscape/fdt.c | 6 ++ arch/arm/include/asm/armv8/mmu.h | 19 +++--- arch/arm/include/asm/u-boot-arm.h | 1 + arch/arm/lib/bootm.c | 7 +++ board/freescale/ls2080a/ls2080a.c | 6 +- board/freescale/ls2080aqds/ls2080aqds.c | 11 ++-- board/freescale/ls2080ardb/ls2080ardb.c | 20 ++++-- cmd/bootefi.c | 15 +++++ configs/ls2080a_emu_defconfig | 1 + configs/ls2080a_simu_defconfig | 1 + configs/ls2080aqds_SECURE_BOOT_defconfig | 1 + configs/ls2080aqds_defconfig | 1 + configs/ls2080aqds_nand_defconfig | 1 + configs/ls2080ardb_SECURE_BOOT_defconfig | 1 + configs/ls2080ardb_defconfig | 1 + configs/ls2080ardb_nand_defconfig | 1 + drivers/net/fsl-mc/mc.c | 24 +++++++- include/configs/ls2080ardb.h | 26 +++++++- include/efi_loader.h | 18 ++++++ lib/efi_loader/efi_boottime.c | 2 + lib/efi_loader/efi_memory.c | 15 +++++ lib/efi_loader/efi_net.c | 7 +++ lib/efi_loader/efi_runtime.c | 101 +++++++++++++++++++++++++++---- 24 files changed, 283 insertions(+), 36 deletions(-) -- 1.8.5.6

3 31

[U-Boot] [v2 1/1] wandboard: fix dtb file names.
by Adam Duskett 20 Jul '16

20 Jul '16

With the previous suggestion from Wolfgang Denk, this patch removes the findfdt function from wandboard.h and instead replaces it with some simple logic in wandboard.c. The new function "set_fdtfile" is called in board_late_init. This function simply finds the length of the dtb file name, allocates enough space for that string, and sets the fdtfile name to that string. This results in slightly shorter / faster script code as well. Dear Adam Duskett, In message <BLU436-SMTP46BCB8C63151CD3166FBD1B9360(a)phx.gbl> you wrote: > With the release of kernel 4.1.15 for the imx6 line of processors, > wandboard now uses imx6q-wandboard-revc1.dtb and imx6dl-wandboard-revc1.dtb. > This patch fixes the naming convention to work with kernel 4.1.15 > > Signed-off-by: Adam Duskett <adamduskett(a)outlook.com> > --- > include/configs/wandboard.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h > index 99f5c0c..d41b600 100644 > --- a/include/configs/wandboard.h > +++ b/include/configs/wandboard.h > @@ -135,9 +135,9 @@ > "setenv bootargs ${bootargs} ${fbmem}\0" \ > "findfdt="\ > "if test $board_name = C1 && test $board_rev = MX6Q ; then " \ > - "setenv fdtfile imx6q-wandboard.dtb; fi; " \ > + "setenv fdtfile imx6q-wandboard-revc1.dtb; fi; " \ > "if test $board_name = C1 && test $board_rev = MX6DL ; then " \ > - "setenv fdtfile imx6dl-wandboard.dtb; fi; " \ > + "setenv fdtfile imx6dl-wandboard-revc1.dtb; fi; " \ > "if test $board_name = B1 && test $board_rev = MX6Q ; then " \ > "setenv fdtfile imx6q-wandboard-revb1.dtb; fi; " \ > "if test $board_name = B1 && test $board_rev = MX6DL ; then " \ Instead of adding to an ever growing list of names, would it not make sense to solve this programmatically, like by concatenating "i" + tolower($board_rev) + "-wandboard-rev" + tolower($board_name) + ".dtb"? I guess this would also result in shorter / faster script code? Best regards, Wolfgang Denk Signed-off-by: Adam Duskett <Adamduskett(a)outlook.com> --- Changes: v1 - v2: - Removed findfdt from h file and moved it to init code. board/wandboard/wandboard.c | 20 ++++++++++++++++++++ include/configs/wandboard.h | 12 ------------ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c index 4ce74cd..a1037ed 100644 --- a/board/wandboard/wandboard.c +++ b/board/wandboard/wandboard.c @@ -29,6 +29,8 @@ #include <phy.h> #include <input.h> #include <i2c.h> +#include <linux/ctype.h> +#include <malloc.h> DECLARE_GLOBAL_DATA_PTR; @@ -377,6 +379,22 @@ static bool is_revc1(void) return false; } +static void set_fdtfile(void) +{ + char *fdtfile; + int i; + int length = strlen(getenv("board_rev")) + strlen("-wandboard-rev") + + strlen(getenv("board_name")) + strlen(".dtb") + 1; + fdtfile = malloc(length); + sprintf(fdtfile, "i%s-wandboard-rev%s.dtb", getenv("board_rev"), getenv("board_name")); + for (i = 0; i < length; i++){ + fdtfile[i] = tolower(fdtfile[i]); + } + + setenv("fdtfile", fdtfile); + free(fdtfile); +} + int board_late_init(void) { #ifdef CONFIG_CMD_BMODE @@ -393,6 +411,8 @@ int board_late_init(void) setenv("board_name", "C1"); else setenv("board_name", "B1"); + + set_fdtfile(); #endif return 0; } diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 99f5c0c..778c3f5 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -133,17 +133,6 @@ "echo '- no FWBADAPT-7WVGA-LCD-F07A-0102 display';" \ "fi; " \ "setenv bootargs ${bootargs} ${fbmem}\0" \ - "findfdt="\ - "if test $board_name = C1 && test $board_rev = MX6Q ; then " \ - "setenv fdtfile imx6q-wandboard.dtb; fi; " \ - "if test $board_name = C1 && test $board_rev = MX6DL ; then " \ - "setenv fdtfile imx6dl-wandboard.dtb; fi; " \ - "if test $board_name = B1 && test $board_rev = MX6Q ; then " \ - "setenv fdtfile imx6q-wandboard-revb1.dtb; fi; " \ - "if test $board_name = B1 && test $board_rev = MX6DL ; then " \ - "setenv fdtfile imx6dl-wandboard-revb1.dtb; fi; " \ - "if test $fdtfile = undefined; then " \ - "echo WARNING: Could not determine dtb to use; fi; \0" \ "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ "ramdisk_addr_r=0x13000000\0" \ @@ -159,7 +148,6 @@ func(DHCP, dhcp, na) #define CONFIG_BOOTCOMMAND \ - "run findfdt; " \ "run distro_bootcmd" #include <config_distro_bootcmd.h> -- 2.7.4

6 11