March 2019 - U-Boot

[U-Boot] [RESEND] [PATCH] cmd: image_info: Add checking of default FIT config
by Bryan O'Donoghue 23 Apr '19

23 Apr '19

This patch adds a check for the default FIT config to iminfo. Once applied any signing of the config will show a pass fail similar to rsa+/rsa-. Output looks like this: Hash(es) for Image 0 (kernel@1): sha1+ Hash(es) for Image 1 (fdt(a)imx7s-warp.dtb): sha1+ Hash(es) for Image 2 (ramdisk@1): sha1+ Hash(es) for Image 3 (bootscr): sha1+ Hash for default configuration: sha1,rsa2048:mbl-fit-rot-key+ Signed-off-by: Bryan O'Donoghue <bryan.odonoghue(a)linaro.org> Cc: Jun Nie <jun.nie(a)linaro.org> Cc: Simon Glass <sjg(a)chromium.org> Cc: Tom Rini <trini(a)konsulko.com> Reviewed-by: Simon Glass <sjg(a)chromium.org> --- cmd/bootm.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/cmd/bootm.c b/cmd/bootm.c index c3a063474a..b3bd236165 100644 --- a/cmd/bootm.c +++ b/cmd/bootm.c @@ -244,6 +244,9 @@ static int do_iminfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int image_info(ulong addr) { +#if defined(CONFIG_FIT) + int cfg_noffset; +#endif void *hdr = (void *)addr; printf("\n## Checking Image at %08lx ...\n", addr); @@ -294,6 +297,20 @@ static int image_info(ulong addr) return 1; } + cfg_noffset = fit_conf_get_node(hdr, NULL); + if (!cfg_noffset) { + printf("Could not find configuration node: %s\n", + fdt_strerror(cfg_noffset)); + return 1; + } + + puts(" Hash for default configuration: "); + if (fit_config_verify(hdr, cfg_noffset)) { + puts("Unable to verify default fit config\n"); + return 1; + } + puts("\n"); + return 0; #endif default: -- 2.20.1

2 1

[U-Boot] [PATCH] spl: avoid printf when we might be doing Ymodem with CONFIG_SPL_FIT_SIGNATURE
by Alex Kiernan 22 Apr '19

22 Apr '19

If CONFIG_SPL_FIT_SIGNATURE is enabled and U-Boot is being loaded from UART over Ymodem then we can't emit messages using printf() without causing errors like: Sending: u-boot-dtb.img Ymodem sectors/kbytes sent: 3009/376kRetry 0: Got 23 for sector ACK Retry 0: NAK on sector Retry 0: Got 68 for sector ACK Retry 0: NAK on sector Ymodem sectors/kbytes sent: 3273/409kRetry 0: Got 23 for sector ACK Retry 0: NAK on sector Retry 0: Got 68 for sector ACK Retry 0: NAK on sector Use debug() rather than printf() to avoid sending messages on the serial port. Signed-off-by: Alex Kiernan <alex.kiernan(a)gmail.com> --- common/spl/spl_fit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index db436268cbcd..08faf2c1b058 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -240,12 +240,12 @@ static int spl_load_fit_image(struct spl_load_info *info, ulong sector, } #ifdef CONFIG_SPL_FIT_SIGNATURE - printf("## Checking hash(es) for Image %s ... ", - fit_get_name(fit, node, NULL)); + debug("## Checking hash(es) for Image %s ... ", + fit_get_name(fit, node, NULL)); if (!fit_image_verify_with_data(fit, node, src, length)) return -EPERM; - puts("OK\n"); + debug("OK\n"); #endif #ifdef CONFIG_SPL_FIT_IMAGE_POST_PROCESS -- 2.17.1

3 5

[U-Boot] [PATCH v2] env: Update env_addr for mmc environment driver
by Pankit Garg 22 Apr '19

22 Apr '19

Signed-off-by: Pankit Garg <pankit.garg(a)nxp.com> --- Changes for v2: - Remove CRC calculation as it is already part of env_import - Update env_addr after env_import env/mmc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/env/mmc.c b/env/mmc.c index c3cf35d..d329bea 100644 --- a/env/mmc.c +++ b/env/mmc.c @@ -313,6 +313,7 @@ static int env_mmc_load(void) int ret; int dev = mmc_get_env_dev(); const char *errmsg; + env_t *ep = NULL; mmc = find_mmc_device(dev); @@ -334,6 +335,10 @@ static int env_mmc_load(void) } ret = env_import(buf, 1); + if (!ret) { + ep = (env_t *)buf; + gd->env_addr = (ulong)&(ep->data); + } fini: fini_mmc_for_env(mmc); -- 1.9.1

2 1

[U-Boot] [PATCH v2 1/1] Set environment location to ENVL_NOWHERE with CONFIG_ENV_IS_NOWHERE.
by Udit Agarwal 22 Apr '19

22 Apr '19

ENVL_NOWHERE is dependent on CONFIG_ENV_IS_NOWHERE and not on CONFIG_CHAIN_OF_TRUST so return ENVL_NOWHERE when CONFIG_ENV_IS_NOWHERE is enabled Signed-off-by: Udit Agarwal <udit.agarwal(a)nxp.com> --- Changes in V2: Corrects commit message. Removes goto label. arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index 34167cdd50..5b945f5959 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -795,12 +795,8 @@ enum env_location env_get_location(enum env_operation op, int prio) if (prio) return ENVL_UNKNOWN; -#ifdef CONFIG_CHAIN_OF_TRUST - /* Check Boot Mode - * If Boot Mode is Secure, return ENVL_NOWHERE - */ - if (fsl_check_boot_mode_secure() == 1) - goto done; +#ifdef CONFIG_ENV_IS_NOWHERE + return env_loc; #endif switch (src) { @@ -830,9 +826,6 @@ enum env_location env_get_location(enum env_operation op, int prio) break; } -#ifdef CONFIG_CHAIN_OF_TRUST -done: -#endif return env_loc; } #endif /* CONFIG_TFABOOT */ -- 2.17.1

2 2

[U-Boot] [PATCH 1/4] rockchip: dts: rk3399: Sync rk3399-opp from Linux
by Jagan Teki 22 Apr '19

22 Apr '19

Sync rk3399-opp.dtsi from Linux. Linux commit details about the rk3399-opp.dtsi sync: "arm64: dts: rockchip: use SPDX-License-Identifier" (sha1: 4ee99cebd486238ac433da823b95cc5f8d8a6905) Signed-off-by: Jagan Teki <jagan(a)amarulasolutions.com> --- arch/arm/dts/rk3399-opp.dtsi | 133 +++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 arch/arm/dts/rk3399-opp.dtsi diff --git a/arch/arm/dts/rk3399-opp.dtsi b/arch/arm/dts/rk3399-opp.dtsi new file mode 100644 index 0000000000..d6f1095abb --- /dev/null +++ b/arch/arm/dts/rk3399-opp.dtsi @@ -0,0 +1,133 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2016-2017 Fuzhou Rockchip Electronics Co., Ltd + */ + +/ { + cluster0_opp: opp-table0 { + compatible = "operating-points-v2"; + opp-shared; + + opp00 { + opp-hz = /bits/ 64 <408000000>; + opp-microvolt = <800000>; + clock-latency-ns = <40000>; + }; + opp01 { + opp-hz = /bits/ 64 <600000000>; + opp-microvolt = <800000>; + }; + opp02 { + opp-hz = /bits/ 64 <816000000>; + opp-microvolt = <850000>; + }; + opp03 { + opp-hz = /bits/ 64 <1008000000>; + opp-microvolt = <925000>; + }; + opp04 { + opp-hz = /bits/ 64 <1200000000>; + opp-microvolt = <1000000>; + }; + opp05 { + opp-hz = /bits/ 64 <1416000000>; + opp-microvolt = <1125000>; + }; + }; + + cluster1_opp: opp-table1 { + compatible = "operating-points-v2"; + opp-shared; + + opp00 { + opp-hz = /bits/ 64 <408000000>; + opp-microvolt = <800000>; + clock-latency-ns = <40000>; + }; + opp01 { + opp-hz = /bits/ 64 <600000000>; + opp-microvolt = <800000>; + }; + opp02 { + opp-hz = /bits/ 64 <816000000>; + opp-microvolt = <825000>; + }; + opp03 { + opp-hz = /bits/ 64 <1008000000>; + opp-microvolt = <875000>; + }; + opp04 { + opp-hz = /bits/ 64 <1200000000>; + opp-microvolt = <950000>; + }; + opp05 { + opp-hz = /bits/ 64 <1416000000>; + opp-microvolt = <1025000>; + }; + opp06 { + opp-hz = /bits/ 64 <1608000000>; + opp-microvolt = <1100000>; + }; + opp07 { + opp-hz = /bits/ 64 <1800000000>; + opp-microvolt = <1200000>; + }; + }; + + gpu_opp_table: opp-table2 { + compatible = "operating-points-v2"; + + opp00 { + opp-hz = /bits/ 64 <200000000>; + opp-microvolt = <800000>; + }; + opp01 { + opp-hz = /bits/ 64 <297000000>; + opp-microvolt = <800000>; + }; + opp02 { + opp-hz = /bits/ 64 <400000000>; + opp-microvolt = <825000>; + }; + opp03 { + opp-hz = /bits/ 64 <500000000>; + opp-microvolt = <875000>; + }; + opp04 { + opp-hz = /bits/ 64 <600000000>; + opp-microvolt = <925000>; + }; + opp05 { + opp-hz = /bits/ 64 <800000000>; + opp-microvolt = <1100000>; + }; + }; +}; + +&cpu_l0 { + operating-points-v2 = <&cluster0_opp>; +}; + +&cpu_l1 { + operating-points-v2 = <&cluster0_opp>; +}; + +&cpu_l2 { + operating-points-v2 = <&cluster0_opp>; +}; + +&cpu_l3 { + operating-points-v2 = <&cluster0_opp>; +}; + +&cpu_b0 { + operating-points-v2 = <&cluster1_opp>; +}; + +&cpu_b1 { + operating-points-v2 = <&cluster1_opp>; +}; + +&gpu { + operating-points-v2 = <&gpu_opp_table>; +}; -- 2.18.0.321.gffc6fa0e3

2 8

[U-Boot] [PATCH v2 00/19] rockchip: Add support for Bob Chromebook
by Simon Glass 21 Apr '19

21 Apr '19

This series adds basic support for Bob which is based on RK3399. Quite a bit of work remains to get this into fully working condition. This series is based on the rockchip pinctrl drivers series by David Wu. It is available at u-boot-dm/rk-working Changes in v2: - Mention EVB RV1108 - Fix the name of the firefly-rk3399 defconfig - Use correct printf format for log message - Add #ifdef guard around variables in rk3399 board_debug_uart_init() Simon Glass (19): lib: Allow using display_buffer() in SPL clk: Improve debug message in clk_set_default_rates() gpio: Use more command-specific enums values gpio: Add a simple GPIO API for SPL rockchip: Add mention of other boards rockchip: Drop note about supporting other SoCs rockchip: Bring in device tree files for rk3399-gru rockchip: Adjust rk3399 device tree to be closer to linux rockchip: evb_rk3399: Tidy up the README rockchip: Clarify docs on SPI writing rockchip: Allow booting from SPI rockchip: Add settings for Samsung LPDDR3 4GB SDRAM 1866MHz rockchip: clk: Add mention of four new clocks rockchip: Tidy up board include-file ordering rockchip: rk3399: Add ROCKCHIP_DEVICE_SETTINGS to set env rockchip: Move pull-up/down enum into a common file rockchip: Implement spl_gpio in the GPIO driver rockchip: gru: Add extra device-tree settings rockchip: Add support for chromebook_bob arch/arm/dts/rk3399-gru-bob.dts | 80 + arch/arm/dts/rk3399-gru-chromebook.dtsi | 398 +++++ arch/arm/dts/rk3399-gru-kevin.dts | 309 ++++ arch/arm/dts/rk3399-gru.dtsi | 844 +++++++++ arch/arm/dts/rk3399-op1-opp.dtsi | 141 ++ .../rk3399-sdram-lpddr3-samsung-4GB-1866.dtsi | 1542 +++++++++++++++++ arch/arm/dts/rk3399.dtsi | 432 ++++- arch/arm/include/asm/arch-rockchip/gpio.h | 30 + .../include/asm/arch-rockchip/grf_rk3288.h | 7 - .../arm/include/asm/arch-rockchip/sys_proto.h | 3 + arch/arm/mach-rockchip/rk3036-board.c | 2 +- arch/arm/mach-rockchip/rk3188-board-spl.c | 2 +- arch/arm/mach-rockchip/rk3188-board.c | 2 +- arch/arm/mach-rockchip/rk322x-board.c | 2 +- arch/arm/mach-rockchip/rk3368-board-spl.c | 2 +- arch/arm/mach-rockchip/rk3368-board-tpl.c | 4 +- arch/arm/mach-rockchip/rk3399-board-spl.c | 51 +- arch/arm/mach-rockchip/rk3399/Kconfig | 10 + arch/arm/mach-rockchip/spl-boot-order.c | 3 + board/google/gru/Kconfig | 15 + board/google/gru/MAINTAINERS | 6 + board/google/gru/Makefile | 5 + board/google/gru/gru.c | 16 + board/rockchip/evb_rk3399/README | 33 +- cmd/gpio.c | 37 +- configs/chromebook_bob_defconfig | 100 ++ doc/README.rockchip | 59 +- drivers/clk/clk-uclass.c | 4 +- drivers/clk/rockchip/clk_rk3399.c | 12 + drivers/gpio/rk_gpio.c | 46 + include/configs/gru.h | 18 + include/configs/rk3399_common.h | 5 + include/spl_gpio.h | 62 + lib/display_options.c | 4 +- 34 files changed, 4163 insertions(+), 123 deletions(-) create mode 100644 arch/arm/dts/rk3399-gru-bob.dts create mode 100644 arch/arm/dts/rk3399-gru-chromebook.dtsi create mode 100644 arch/arm/dts/rk3399-gru-kevin.dts create mode 100644 arch/arm/dts/rk3399-gru.dtsi create mode 100644 arch/arm/dts/rk3399-op1-opp.dtsi create mode 100644 arch/arm/dts/rk3399-sdram-lpddr3-samsung-4GB-1866.dtsi create mode 100644 board/google/gru/Kconfig create mode 100644 board/google/gru/MAINTAINERS create mode 100644 board/google/gru/Makefile create mode 100644 board/google/gru/gru.c create mode 100644 configs/chromebook_bob_defconfig create mode 100644 include/configs/gru.h create mode 100644 include/spl_gpio.h -- 2.20.1.321.g9e740568ce-goog

3 45

[U-Boot] [PATCH v7 00/15] SiFive FU540 Support
by Anup Patel 20 Apr '19

20 Apr '19

This patchset adds SiFive Freedom Unleashed (FU540) support to RISC-V U-Boot. The patches are based upon latest U-Boot source tree (git://git.denx.de/u-boot.git) at commit id dbe70c7d4e3d5c705a98d82952e05a591efd0683 All drivers namely: SiFive PRCI, SiFive Serial, and Cadance MACB Ethernet work fine on actual SiFive Unleashed board and QEMU sifive_u machine. Changes since v6: - Rebased patches to latest U-Boot source tree - Droped PATCH1 and PATCH2. Instead added a PATCH to select CREATE_ARCH_SYMLINK for RISC-V - Few typo fixes in SiFive FU540 readme Changes since v5: - Added PATCH16 to fix INITRD passing to Linux using bootm for U-Boot RISC-V Changes since v4: - Removed #ifndef from macb_enable_clk() in PATCH7 - Updated test/dm/clk.c in PATCH10 to test fixed factor clock using sandbox Changes since v3: - Added patch to un-ignore arch/riscv/include/asm/arch - Added patch to fix mrproper make target to only remove arch/*/include/asm/arch paths which are symlinks - Added patch to have place-holder asm/arch/clk.h for RISC-V - Removed "#ifndef CONFIG_RISCV" from macb clk API patch Changes since v2: - Fixed typo in PATCH3 comments - Removed "#if" from clk_fixed_factor_ofdata_to_platdata() in PATCH7 - Added PATCH12 for SiFive FU540 README guide Changes since v1: - Re-ordered SoB in patches with multiple SoB - Simplified board_get_usable_ram_top() added by PATCH3 Anup Patel (10): riscv: Enable create symlink using kconfig riscv: Rename cpu/qemu to cpu/generic riscv: Add asm/dma-mapping.h for DMA mappings riscv: Add place-holder asm/arch/clk.h for driver compilation riscv: generic: Ensure that U-Boot runs within 4GB for 64bit systems net: macb: Fix clk API usage for RISC-V systems clk: Add SiFive FU540 PRCI clock driver clk: Add fixed-factor clock driver riscv: Add SiFive FU540 board support riscv: Enable CONFIG_SYS_BOOT_RAMDISK_HIGH for using initrd Atish Patra (5): net: macb: Fix GEM hardware detection drivers: serial_sifive: Fix baud rate calculation drivers: serial_sifive: Skip baudrate config if no input clock cpu: Bind timer driver for boot hart doc: Add a readme guide for SiFive FU540 arch/Kconfig | 1 + arch/riscv/Kconfig | 6 +- arch/riscv/cpu/{qemu => generic}/Kconfig | 2 +- arch/riscv/cpu/{qemu => generic}/Makefile | 0 arch/riscv/cpu/{qemu => generic}/cpu.c | 0 arch/riscv/cpu/generic/dram.c | 37 ++ arch/riscv/cpu/qemu/dram.c | 17 - arch/riscv/include/asm/arch-generic/clk.h | 14 + arch/riscv/include/asm/config.h | 1 + arch/riscv/include/asm/dma-mapping.h | 38 ++ arch/sandbox/dts/test.dts | 8 + board/emulation/qemu-riscv/Kconfig | 4 +- .../qemu-riscv => sifive/fu540}/Kconfig | 36 +- board/sifive/fu540/MAINTAINERS | 9 + board/sifive/fu540/Makefile | 5 + board/sifive/fu540/fu540.c | 17 + configs/sifive_fu540_defconfig | 11 + doc/README.sifive-fu540 | 303 +++++++++ drivers/clk/Kconfig | 1 + drivers/clk/Makefile | 5 +- drivers/clk/clk_fixed_factor.c | 72 +++ drivers/clk/sifive/Kconfig | 19 + drivers/clk/sifive/Makefile | 5 + .../clk/sifive/analogbits-wrpll-cln28hpc.h | 101 +++ drivers/clk/sifive/fu540-prci.c | 604 ++++++++++++++++++ drivers/clk/sifive/wrpll-cln28hpc.c | 390 +++++++++++ drivers/cpu/riscv_cpu.c | 7 +- drivers/net/macb.c | 11 +- drivers/serial/serial_sifive.c | 60 +- include/configs/sifive-fu540.h | 43 ++ include/dt-bindings/clk/sifive-fu540-prci.h | 29 + test/dm/clk.c | 5 +- 32 files changed, 1795 insertions(+), 66 deletions(-) rename arch/riscv/cpu/{qemu => generic}/Kconfig (91%) rename arch/riscv/cpu/{qemu => generic}/Makefile (100%) rename arch/riscv/cpu/{qemu => generic}/cpu.c (100%) create mode 100644 arch/riscv/cpu/generic/dram.c delete mode 100644 arch/riscv/cpu/qemu/dram.c create mode 100644 arch/riscv/include/asm/arch-generic/clk.h create mode 100644 arch/riscv/include/asm/dma-mapping.h copy board/{emulation/qemu-riscv => sifive/fu540}/Kconfig (57%) create mode 100644 board/sifive/fu540/MAINTAINERS create mode 100644 board/sifive/fu540/Makefile create mode 100644 board/sifive/fu540/fu540.c create mode 100644 configs/sifive_fu540_defconfig create mode 100644 doc/README.sifive-fu540 create mode 100644 drivers/clk/clk_fixed_factor.c create mode 100644 drivers/clk/sifive/Kconfig create mode 100644 drivers/clk/sifive/Makefile create mode 100644 drivers/clk/sifive/analogbits-wrpll-cln28hpc.h create mode 100644 drivers/clk/sifive/fu540-prci.c create mode 100644 drivers/clk/sifive/wrpll-cln28hpc.c create mode 100644 include/configs/sifive-fu540.h create mode 100644 include/dt-bindings/clk/sifive-fu540-prci.h -- 2.17.1

10 50

[U-Boot] [PATCH 0/6] - Add Ethernet support for stm32mpu
by Christophe Roullier 19 Apr '19

19 Apr '19

Support all PHY config: PHY_MODE (MII,GMII, RMII, RGMII) Phy wo crystal (25Mhz and 50 Mhz), No 125Mhz from PHY config Christophe Roullier (5): board: stm32mp1: Add board_interface_eth_init net: dwc_eth_qos: add Ethernet stm32mp1 support ARM: dts: stm32: Add Ethernet support on stm32mp1 stm32mp1: Add Ethernet support for stm32mp1 board configs: stm32mp15: Enable Ethernet feature Patrick Delaunay (1): stm32mp1: clk: use the correct identifier for ethck arch/arm/dts/stm32mp157-pinctrl.dtsi | 31 +++ arch/arm/dts/stm32mp157c-ev1.dts | 21 ++ arch/arm/dts/stm32mp157c.dtsi | 35 +++ board/st/stm32mp1/stm32mp1.c | 77 +++++++ configs/stm32mp15_basic_defconfig | 2 + drivers/clk/clk_stm32mp1.c | 2 +- drivers/net/dwc_eth_qos.c | 435 ++++++++++++++++++++++++++++++----- include/configs/stm32mp1.h | 11 +- 8 files changed, 560 insertions(+), 54 deletions(-) -- 2.7.4

2 11

[U-Boot] [PATCH v2] sunxi: Fix build when CONFIG_CMD_PXE or CONFIG_CMD_DHCP are disabled
by megous＠megous.com 18 Apr '19

18 Apr '19

From: Ondrej Jirman <megous(a)megous.com> Fixes a compilation failure with disabled PXE or DHCP command when using sunxi platform. Signed-off-by: Ondřej Jirman <megous(a)megous.com> --- This was previously sent as a part of other series of patches, but it's unrelated to the rest of the patches, so I'm resending it individually. v2: - improved description include/configs/sunxi-common.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index b01d1c3c84..d421b93509 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -399,6 +399,18 @@ extern int soft_i2c_gpio_scl; #define BOOT_TARGET_DEVICES_USB(func) #endif +#ifdef CONFIG_CMD_PXE +#define BOOT_TARGET_DEVICES_PXE(func) func(PXE, pxe, na) +#else +#define BOOT_TARGET_DEVICES_PXE(func) +#endif + +#ifdef CONFIG_CMD_DHCP +#define BOOT_TARGET_DEVICES_DHCP(func) func(DHCP, dhcp, na) +#else +#define BOOT_TARGET_DEVICES_DHCP(func) +#endif + /* FEL boot support, auto-execute boot.scr if a script address was provided */ #define BOOTENV_DEV_FEL(devtypeu, devtypel, instance) \ "bootcmd_fel=" \ @@ -414,8 +426,8 @@ extern int soft_i2c_gpio_scl; BOOT_TARGET_DEVICES_MMC(func) \ BOOT_TARGET_DEVICES_SCSI(func) \ BOOT_TARGET_DEVICES_USB(func) \ - func(PXE, pxe, na) \ - func(DHCP, dhcp, na) + BOOT_TARGET_DEVICES_PXE(func) \ + BOOT_TARGET_DEVICES_DHCP(func) #ifdef CONFIG_OLD_SUNXI_KERNEL_COMPAT #define BOOTCMD_SUNXI_COMPAT \ -- 2.20.1

2 2

[U-Boot] [PATCH v2 2/2] Kconfig: Add u-boot.itb BUILD_TARGET for Rockchip
by Jagan Teki 18 Apr '19

18 Apr '19

Add u-boot.itb BUILD_TARGET for Rockchip platform when SPL_LOAD_FIT is being used. This can get rid of building itb explicitly with 'make u-boot.itb' all required images will now build just by make. Signed-off-by: Jagan Teki <jagan(a)amarulasolutions.com> --- Changes for v2: - build target type 'u-boot.itb' when SPL_LOAD_FIT being used Kconfig | 2 +- board/rockchip/evb_rk3399/README | 1 - board/theobroma-systems/lion_rk3368/README | 9 ++------- board/theobroma-systems/puma_rk3399/README | 1 - board/vamrs/rock960_rk3399/README | 1 - 5 files changed, 3 insertions(+), 11 deletions(-) diff --git a/Kconfig b/Kconfig index 15b79259a8..cf175ef33f 100644 --- a/Kconfig +++ b/Kconfig @@ -229,7 +229,7 @@ config BUILD_TARGET default "u-boot-with-spl.sfp" if ARCH_SOCFPGA default "u-boot-spl.kwb" if ARCH_MVEBU && SPL_BUILD default "u-boot-elf.srec" if RCAR_GEN3 - default "u-boot.itb" if SPL_LOAD_FIT && ARCH_SUNXI + default "u-boot.itb" if SPL_LOAD_FIT && (ARCH_ROCKCHIP || ARCH_SUNXI) help Some SoCs need special image types (e.g. U-Boot binary with a special header) as build targets. By defining diff --git a/board/rockchip/evb_rk3399/README b/board/rockchip/evb_rk3399/README index 8321467046..c388f269c1 100644 --- a/board/rockchip/evb_rk3399/README +++ b/board/rockchip/evb_rk3399/README @@ -58,7 +58,6 @@ Compile the U-Boot for firefly-rk3399, use below instead: > make firefly-rk3399_defconfig > make - > make u-boot.itb Get spl/u-boot-spl.bin and u-boot.itb in this step. diff --git a/board/theobroma-systems/lion_rk3368/README b/board/theobroma-systems/lion_rk3368/README index 83e4332984..241d4d9ec8 100644 --- a/board/theobroma-systems/lion_rk3368/README +++ b/board/theobroma-systems/lion_rk3368/README @@ -14,18 +14,13 @@ Configure U-Boot > cd ../u-boot > make lion-rk3368_defconfig -Build the TPL/SPL stage -======================= +Build the TPL/SPL, U-Boot proper and a FIT image including the ATF +================================================================== > make CROSS_COMPILE=aarch64-unknown-elf- ARCH=arm > tools/mkimage -n rk3368 -T rksd -d tpl/u-boot-tpl.bin spl-3368.img > cat spl/u-boot-spl-dtb.bin >> spl-3368.img -Build the full U-Boot and a FIT image including the ATF -======================================================= - - > make CROSS_COMPILE=aarch64-unknown-elf- ARCH=arm u-boot.itb - Flash the image =============== diff --git a/board/theobroma-systems/puma_rk3399/README b/board/theobroma-systems/puma_rk3399/README index f67dfb451f..c06c9650b8 100644 --- a/board/theobroma-systems/puma_rk3399/README +++ b/board/theobroma-systems/puma_rk3399/README @@ -60,7 +60,6 @@ Creating a SPL image for SD-Card/eMMC Creating a SPL image for SPI-NOR > tools/mkimage -n rk3399 -T rkspi -d spl/u-boot-spl.bin spl_nor.img Create the FIT image containing U-Boot proper, ATF, M0 Firmware, devicetree - > make CROSS_COMPILE=aarch64-linux-gnu- u-boot.itb Flash the image =============== diff --git a/board/vamrs/rock960_rk3399/README b/board/vamrs/rock960_rk3399/README index d14399090e..c5c675c4ea 100644 --- a/board/vamrs/rock960_rk3399/README +++ b/board/vamrs/rock960_rk3399/README @@ -61,7 +61,6 @@ Compile the U-Boot > export CROSS_COMPILE=aarch64-linux-gnu- > make rock960-rk3399_defconfig > make - > make u-boot.itb Compile the rkdeveloptool ========================= -- 2.18.0.321.gffc6fa0e3

2 2