Re: [U-Boot] [PATCH v2 1/3] rockchip: rk3399: derive ethaddr from cpuid
HI Rohan, On 2019/7/19 下午10:56, Rohan Garg wrote: Hey Kever This should be depends on CONFIG_MISC_INIT_R. Ack. It's great to make these code as common code so that other SoCs can share it, is it possible to also make this function common? Not every SoC have efuse driver, so for those SoCs, we need a random serial No. Do you think we can merge this as is for now and then move onto making it more generic for other devices at a later date? This is a per-SoC feature, so it's fine to add this into rk3399-board.c without much extra work, and other device can enable or disable it by the option CONFIG_MISC_INIT_R. So I think you can move the code from evb-rk3399.c to rk3399-board.c directly. Thanks, - Kever + const u32 cpuid_offset = 0x7; + const u32 cpuid_length = 0x10; + u8 cpuid[cpuid_length]; + + rockchip_cpuid_from_efuse(cpuid_offset, cpuid_length, cpuid); + rockchip_cpuid_set(cpuid, cpuid_length); + rockchip_setup_macaddr(); It will be better for these function calls with return value. There should be a blank line before 'return'; Ack. Cheers Rohan Garg ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] rockchip: TPL banner should depend on CONFIG_TPL_BANNER_PRINT
Hi Chris,
On 2019/7/19 下午9:23, Chris Webb wrote:
The generic code in common/spl/spl.c allows TPL/SPL banners to be
silenced by unsetting CONFIG_TPL_BANNER_PRINT or CONFIG_SPL_BANNER_PRINT
respectively. However, arch/arm/mach-rockchip/tpl.c prints this banner
unconditionally.
Fix the rockchip-specific tpl.c so that the TPL banner depends on
CONFIG_TPL_BANNER_PRINT in the same way as the generic code.
Signed-off-by:
Reviewed-by: Kever Yang
Thanks,
- Kever
---
arch/arm/mach-rockchip/tpl.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/mach-rockchip/tpl.c b/arch/arm/mach-rockchip/tpl.c
index 5df88bddeb..55f6e922d0 100644
--- a/arch/arm/mach-rockchip/tpl.c
+++ b/arch/arm/mach-rockchip/tpl.c
@@ -54,8 +54,10 @@ void board_init_f(ulong dummy)
* printascii("string");
*/
debug_uart_init();
+#ifdef CONFIG_TPL_BANNER_PRINT
printascii("\nU-Boot TPL " PLAIN_VERSION " (" U_BOOT_DATE " - " \
U_BOOT_TIME ")\n");
+#endif
#endif
ret = spl_early_init();
if (ret) {
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 1/2] rockchip: Fix TPL build without CONFIG_TPL_SERIAL_SUPPORT
Hi Chris, On 2019/7/19 下午9:23, Chris Webb wrote: If CONFIG_DEBUG_UART is set but CONFIG_TPL_SERIAL_SUPPORT is not, the serial output should be available in SPL and full U-Boot, but not built in TPL. However, the rockchip tpl.c instead fails to compile with undefined references to the debug UART. Instead, initialise the debug UART and print the TPL banner only if both CONFIG_DEBUG_UART and CONFIG_TPL_SERIAL_SUPPORT are set. Signed-off-by: Reviewed-by: Kever Yang Thanks, - Kever --- arch/arm/mach-rockchip/tpl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-rockchip/tpl.c b/arch/arm/mach-rockchip/tpl.c index 0ff2a197ed..5df88bddeb 100644 --- a/arch/arm/mach-rockchip/tpl.c +++ b/arch/arm/mach-rockchip/tpl.c @@ -44,7 +44,7 @@ void board_init_f(ulong dummy) struct udevice *dev; int ret; -#ifdef CONFIG_DEBUG_UART +#if defined(CONFIG_DEBUG_UART) && defined(CONFIG_TPL_SERIAL_SUPPORT) /* * Debug UART can be used from here if required: * ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] Pull request: u-boot-rockchip/tags/rockchip-for-v2019.07
Hi Tom, Please pull rockchip the update: - rk3399 lpddr4 support - rk3399-rock960 board support improvement - Eliminate pyelftools dependency by make_fit_atf.py - clean up rockchip dts to use -u-boot.dtsi - use ARM arch/generic timer instead of rk_timer - clean up Kconfig options for board support Travis: https://travis-ci.org/keveryang/u-boot/builds/561434501 Thanks, - Kever The following changes since commit 0de815356474912ef5bef9a69f0327a5a93bb2c2: Merge branch '2019-07-17-master-imports' (2019-07-18 11:31:37 -0400) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip.git tags/rockchip-for-v2019.07 for you to fetch changes up to 8b1ceb0ac1aa1746c6751d698ce7a012a236fa65: rockchip: Remove obsolete references to pyelftools (2019-07-20 23:59:44 +0800) Andy Yan (2): rockchip: dts: rk3399: Add spl-boot-order for Rock PI 4 rockchip: dts: rk3399: Add 'same-as-spl' for Rock PI 4 Chris Webb (2): rockchip: make_fit_atf.py: Eliminate pyelftools dependency rockchip: Remove obsolete references to pyelftools Jagan Teki (78): ram: rk3399: Fix code warnings ram: rk3399: Some trivial code fixes ram: rk3399: s/sdram_params/params ram: rk3399: Handle pctl_cfg return type ram: rk3399: s/tsel_wr_select_n/tsel_wr_select_dq_n ram: rk3399: s/tsel_wr_select_p/tsel_wr_select_dq_p ram: rk3399: s/ca_tsel_wr_select_n/tsel_wr_select_ca_n ram: rk3399: s/ca_tsel_wr_select_p/tsel_wr_select_ca_p ram: rk3399: Order tsel variables ram: rockchip: rk3399: Add cap_info structure ram: rk3399: s/rk3399_base_params/sdram_base_params ram: rk3399: Move common sdram structures in common header arm: include: rockchip: Move dramtypes to common header arm: include: rockchip: Add DDR4 enum clk: rockchip: rk3399: Fix check patch warnings and checks ram: rk3399: Handle data training return types ram: rk3399: Clear PI_175 interrupts in data training ram: rk3399: Use rank mask in ca data training ram: rk3399: Use rank mask in wdql data training ram: rk3399: Add phy pctrl reset support ram: rk3399: Move pwrup_srefresh_exit to dram_info ram: rk3399: Add pctl start support ram: rockchip: Add initial Kconfig debug_uart: Add printdec ram: rockchip: Add debug sdram driver ram: rockchip: debug: Add sdram_print_ddr_info ram: rockchip: debug: Get the cs capacity ram: rk3399: debug: Add sdram_print_stride ram: rk3399: Compute stride for 2 channels ram: rk3399: Compute stride for 1 channel a ram: rk3399: Add rank detection support ram: rk3399: Enable sdram debug functions ram: rk3399: Simply existing dram enc macro ram: rk3399: Rename sys_reg with sys_reg2 ram: rk3399: Introduce sys_reg3 for more capacity info ram: rk3399: Add ddr version enc macro ram: rk3399: Add ddrtimingC0 ram: rk3399: Add DdrMode ram: rk3399: Configure phy IO in ds odt ram: rockchip: Kconfig: Add RK3399 LPDDR4 entry ram: rk3399: Add lpddr4 rank mask for ca training ram: rk3399: Add lpddr4 rank mask for wdql training ram: rk3399: Move mode_sel assignment ram: rk3399: Don't wait for PLL lock in lpddr4 ram: rk3399: Avoid two channel ZQ Cal Start at the same time ram: rk3399: Configure PHY_898, PHY_919 for lpddr4 ram: rk3399: Configure BOOSTP_EN, BOOSTN_EN for lpddr4 ram: rk3399: Configure SLEWP_EN, SLEWN_EN for lpddr4 ram: rk3399: Configure PHY RX_CM_INPUT for lpddr4 ram: rk3399: Map chipselect for lpddr4 ram: rk3399: Configure tsel write ca for lpddr4 ram: rk3399: Don't disable dfi dram clk for lpddr4, rank 1 ram: rk3399: Add IO settings ram: sdram: Configure lpddr4 tsel rd, wr based on IO settings ram: rk3399: Add tsel control clock drive ram: rk3399: Configure soc odt support ram: rk3399: Get lpddr4 tsel_rd_en from io settings ram: rk3399: Update lpddr4 vref based on io settings ram: rk3399: Update lpddr4 mode_sel based on io settings ram: rk3399: Update lpddr4 vref_mode_ac ram: rk3399: Simplify data training first argument ram: rk3399: Handle data training via ops ram: rk3399: Add LPPDR4 mr detection arm: include: rockchip: Add rk3399 pmu file rockchip: rk3399: syscon: Add pmu support rockchip: dts: rk3399: Add u-boot, dm-pre-reloc for pmu clk: rockchip: rk3399: Set 50MHz ddr clock clk: rockchip: rk3399: Set 400MHz ddr clock ram: rk3399: Add LPPDDR4-400 timings inc ram: rk3399: Add LPPDDR4-800 timings inc ram: rk3399: Add set_rate sdram rk3399 ops ram: rk3399: Add lpddr4 set rate support configs: rockpro64: Enable LPDDR4 support configs: rock-pi-4: Enable LPDDR4 support rockchip: dts: rk3399: Add
[U-Boot] [PATCH v2 18/18] autoboot: Adjust the implementation in autoboot_command()
Avoid use of #ifdef and keep the common condion in a variable. This makes
the code easier to read.
Signed-off-by: Simon Glass
---
Changes in v2:
- Rebase to master
common/autoboot.c | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/common/autoboot.c b/common/autoboot.c
index 75132f8697..42fbd7614a 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -349,15 +349,18 @@ void autoboot_command(const char *s)
debug("### main_loop: bootcmd=\"%s\"\n", s ? s : "");
if (stored_bootdelay != -1 && s && !abortboot(stored_bootdelay)) {
-#if defined(CONFIG_AUTOBOOT_KEYED) && !defined(CONFIG_AUTOBOOT_KEYED_CTRLC)
- int prev = disable_ctrlc(1);/* disable Control C checking */
-#endif
+ bool lock;
+ int prev;
+
+ lock = IS_ENABLED(CONFIG_AUTOBOOT_KEYED) &&
+ !IS_ENABLED(CONFIG_AUTOBOOT_KEYED_CTRLC);
+ if (lock)
+ prev = disable_ctrlc(1); /* disable Ctrl-C checking */
run_command_list(s, -1, 0);
-#if defined(CONFIG_AUTOBOOT_KEYED) && !defined(CONFIG_AUTOBOOT_KEYED_CTRLC)
- disable_ctrlc(prev);/* restore Control C checking */
-#endif
+ if (lock)
+ disable_ctrlc(prev);/* restore Ctrl-C checking */
}
if (IS_ENABLED(CONFIG_USE_AUTOBOOT_MENUKEY) &&
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 17/18] autoboot: Move a few more options from #ifdef to if()
Adjust some of the code which can be trivially moved to use IS_ENABLED()
instead of #ifdef.
Signed-off-by: Simon Glass
---
Changes in v2: None
common/autoboot.c | 19 +--
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/common/autoboot.c b/common/autoboot.c
index a38527ff96..75132f8697 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -292,7 +292,7 @@ static int abortboot(int bootdelay)
static void process_fdt_options(const void *blob)
{
-#if defined(CONFIG_OF_CONTROL) && defined(CONFIG_SYS_TEXT_BASE)
+#ifdef CONFIG_SYS_TEXT_BASE
ulong addr;
/* Add an env variable to point to a kernel payload, if available */
@@ -304,7 +304,7 @@ static void process_fdt_options(const void *blob)
addr = fdtdec_get_config_int(gd->fdt_blob, "rootdisk-offset", 0);
if (addr)
env_set_addr("rootaddr", (void *)(CONFIG_SYS_TEXT_BASE + addr));
-#endif /* CONFIG_OF_CONTROL && CONFIG_SYS_TEXT_BASE */
+#endif /* CONFIG_SYS_TEXT_BASE */
}
const char *bootdelay_process(void)
@@ -317,16 +317,14 @@ const char *bootdelay_process(void)
s = env_get("bootdelay");
bootdelay = s ? (int)simple_strtol(s, NULL, 10) : CONFIG_BOOTDELAY;
-#ifdef CONFIG_OF_CONTROL
- bootdelay = fdtdec_get_config_int(gd->fdt_blob, "bootdelay",
- bootdelay);
-#endif
+ if (IS_ENABLED(CONFIG_OF_CONTROL))
+ bootdelay = fdtdec_get_config_int(gd->fdt_blob, "bootdelay",
+ bootdelay);
debug("### main_loop entered: bootdelay=%d\n\n", bootdelay);
-#if defined(CONFIG_AUTOBOOT_MENU_SHOW)
- bootdelay = menu_show(bootdelay);
-#endif
+ if (IS_ENABLED(CONFIG_AUTOBOOT_MENU_SHOW))
+ bootdelay = menu_show(bootdelay);
bootretry_init_cmd_timeout();
#ifdef CONFIG_POST
@@ -339,7 +337,8 @@ const char *bootdelay_process(void)
else
s = env_get("bootcmd");
- process_fdt_options(gd->fdt_blob);
+ if (IS_ENABLED(CONFIG_OF_CONTROL))
+ process_fdt_options(gd->fdt_blob);
stored_bootdelay = bootdelay;
return s;
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 16/18] autoboot: Add comments for menu_show()
Add comments for this function. Also remove the #ifdef around it so that it can be called from 'if (IS_ENABLED(...))'. Signed-off-by: Simon Glass --- Changes in v2: None include/menu.h | 17 +++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/include/menu.h b/include/menu.h index 8fd7b0a1f0..2d227c20bd 100644 --- a/include/menu.h +++ b/include/menu.h @@ -19,7 +19,20 @@ int menu_destroy(struct menu *m); void menu_display_statusline(struct menu *m); int menu_default_choice(struct menu *m, void **choice); -#if defined(CONFIG_AUTOBOOT_MENU_SHOW) +/** + * menu_show() Show a boot menu + * + * This shows a menu and lets the user select an option. The menu is defined by + * environment variables (see README.bootmenu). + * + * This function doesn't normally return, but if the users requests the command + * problem, it will. + * + * @bootdelay: Delay to wait before running the default menu option (0 to run + * the entry immediately) + * @return If it returns, it always returns -1 to indicate that the boot should + * be aborted and the command prompt should be provided + */ int menu_show(int bootdelay); -#endif + #endif /* __MENU_H__ */ -- 2.22.0.657.g960e92d24f-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 15/18] Convert CONFIG_AUTOBOOT_MENU_SHOW to Kconfig
This converts the following to Kconfig: CONFIG_AUTOBOOT_MENU_SHOW Signed-off-by: Simon Glass --- Changes in v2: None cmd/Kconfig | 8 configs/nokia_rx51_defconfig | 1 + include/configs/nokia_rx51.h | 2 -- include/configs/vexpress_aemv8a.h | 2 -- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index d0c43c524a..44f99817c2 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -170,6 +170,14 @@ config AUTOBOOT_MENUKEY For example, 33 means "!" in ASCII, so pressing ! at boot would take this action. +config AUTOBOOT_MENU_SHOW + bool "Show a menu on boot" + help + This enables the boot menu, controlled by environment variables + defined by the board. The menu starts after running the 'preboot' + environmnent variable (if enabled) and before handling the boot delay. + See README.bootmenu for more details. + endmenu config BUILD_BIN2C diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig index 5cd96017e5..ab5bb2de6f 100644 --- a/configs/nokia_rx51_defconfig +++ b/configs/nokia_rx51_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Nokia RX-51 # " CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_MENU_SHOW=y CONFIG_CMD_BOOTMENU=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_SAVEENV is not set diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index b251061e30..fd755bbcea 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -270,8 +270,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); "run attachboot;" \ "echo" -#define CONFIG_AUTOBOOT_MENU_SHOW - /* * Miscellaneous configurable options */ diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 2b1269de83..89cd8b550a 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -110,8 +110,6 @@ #define CONFIG_PL011_CLOCK 2400 #endif -/*#define CONFIG_AUTOBOOT_MENU_SHOW*/ - /* BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -- 2.22.0.657.g960e92d24f-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 14/18] autoboot: Rename CONFIG_MENU_SHOW to include AUTOBOOT
Rename this option to CONFIG_AUTOBOOT_MENU_SHOW this it relates to the
autoboot functionality.
Signed-off-by: Simon Glass
---
Changes in v2: None
cmd/bootmenu.c| 2 +-
common/autoboot.c | 2 +-
doc/README.bootmenu | 2 +-
doc/README.menu | 2 +-
include/configs/nokia_rx51.h | 2 +-
include/configs/vexpress_aemv8a.h | 2 +-
include/menu.h| 2 +-
scripts/config_whitelist.txt | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c
index 7f88c1ed63..0ae9d5a681 100644
--- a/cmd/bootmenu.c
+++ b/cmd/bootmenu.c
@@ -472,7 +472,7 @@ void menu_display_statusline(struct menu *m)
puts(ANSI_CLEAR_LINE);
}
-#ifdef CONFIG_MENU_SHOW
+#ifdef CONFIG_AUTOBOOT_MENU_SHOW
int menu_show(int bootdelay)
{
bootmenu_show(bootdelay);
diff --git a/common/autoboot.c b/common/autoboot.c
index 9752470873..a38527ff96 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -324,7 +324,7 @@ const char *bootdelay_process(void)
debug("### main_loop entered: bootdelay=%d\n\n", bootdelay);
-#if defined(CONFIG_MENU_SHOW)
+#if defined(CONFIG_AUTOBOOT_MENU_SHOW)
bootdelay = menu_show(bootdelay);
#endif
bootretry_init_cmd_timeout();
diff --git a/doc/README.bootmenu b/doc/README.bootmenu
index 34ff8d5ecc..ca5099089e 100644
--- a/doc/README.bootmenu
+++ b/doc/README.bootmenu
@@ -91,7 +91,7 @@ To run the bootmenu at startup add these additional
definitions:
#define CONFIG_AUTOBOOT_KEYED
#define CONFIG_BOOTDELAY 30
- #define CONFIG_MENU_SHOW
+ #define CONFIG_AUTOBOOT_MENU_SHOW
When you intend to use the bootmenu on color frame buffer console,
make sure to additionally define CONFIG_CFB_CONSOLE_ANSI in the
diff --git a/doc/README.menu b/doc/README.menu
index 450c6a83a7..0f3d741605 100644
--- a/doc/README.menu
+++ b/doc/README.menu
@@ -14,7 +14,7 @@ Menus are composed of items. Each item has a key used to
identify it in
the menu, and an opaque pointer to data controlled by the consumer.
If you want to show a menu, instead starting the shell, define
-CONFIG_MENU_SHOW. You have to code the int menu_show(int bootdelay)
+CONFIG_AUTOBOOT_MENU_SHOW. You have to code the int menu_show(int bootdelay)
function, which handle your menu. This function returns the remaining
bootdelay.
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index f47d088303..b251061e30 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -270,7 +270,7 @@ int rx51_kp_getc(struct stdio_dev *sdev);
"run attachboot;" \
"echo"
-#define CONFIG_MENU_SHOW
+#define CONFIG_AUTOBOOT_MENU_SHOW
/*
* Miscellaneous configurable options
diff --git a/include/configs/vexpress_aemv8a.h
b/include/configs/vexpress_aemv8a.h
index 2354f4e958..2b1269de83 100644
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -110,7 +110,7 @@
#define CONFIG_PL011_CLOCK 2400
#endif
-/*#define CONFIG_MENU_SHOW*/
+/*#define CONFIG_AUTOBOOT_MENU_SHOW*/
/* BOOTP options */
#define CONFIG_BOOTP_BOOTFILESIZE
diff --git a/include/menu.h b/include/menu.h
index fbff429c89..8fd7b0a1f0 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -19,7 +19,7 @@ int menu_destroy(struct menu *m);
void menu_display_statusline(struct menu *m);
int menu_default_choice(struct menu *m, void **choice);
-#if defined(CONFIG_MENU_SHOW)
+#if defined(CONFIG_AUTOBOOT_MENU_SHOW)
int menu_show(int bootdelay);
#endif
#endif /* __MENU_H__ */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 8773169c8b..780520d584 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -96,6 +96,7 @@ CONFIG_ATMEL_LEGACY
CONFIG_ATMEL_MCI_8BIT
CONFIG_ATMEL_SPI0
CONFIG_AT_TRANS
+CONFIG_AUTOBOOT_MENU_SHOW
CONFIG_AUTO_ZRELADDR
CONFIG_BACKSIDE_L2_CACHE
CONFIG_BAT_PAIR
@@ -1141,7 +1142,6 @@ CONFIG_MEMSIZE_MASK
CONFIG_MEM_HOLE_16M
CONFIG_MEM_INIT_VALUE
CONFIG_MEM_REMAP
-CONFIG_MENU_SHOW
CONFIG_MFG_ENV_SETTINGS
CONFIG_MIIM_ADDRESS
CONFIG_MII_DEFAULT_TSEC
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 13/18] autoboot: Tidy up use of menukey
Move the variable to the top of the file and adjust the code which uses it
to use if() rather than #ifdef, to make it easier to read.
Signed-off-by: Simon Glass
---
Changes in v2: None
common/autoboot.c | 26 ++
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/common/autoboot.c b/common/autoboot.c
index ad189a8ba2..9752470873 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -28,6 +28,7 @@ DECLARE_GLOBAL_DATA_PTR;
/* Stored value of bootdelay, used by autoboot_command() */
static int stored_bootdelay;
+static int menukey;
#ifdef CONFIG_AUTOBOOT_ENCRYPTION
#define AUTOBOOT_STOP_STR_SHA256 CONFIG_AUTOBOOT_STOP_STR_SHA256
@@ -35,6 +36,12 @@ static int stored_bootdelay;
#define AUTOBOOT_STOP_STR_SHA256 ""
#endif
+#ifdef CONFIG_USE_AUTOBOOT_MENUKEY
+#define AUTOBOOT_MENUKEY CONFIG_USE_AUTOBOOT_MENUKEY
+#else
+#define AUTOBOOT_MENUKEY 0
+#endif
+
/*
* Use a "constant-length" time compare function for this
* hash compare:
@@ -224,10 +231,6 @@ static int abortboot_key_sequence(int bootdelay)
return abort;
}
-#ifdef CONFIG_USE_AUTOBOOT_MENUKEY
-static int menukey;
-#endif
-
static int abortboot_single_key(int bootdelay)
{
int abort = 0;
@@ -250,13 +253,13 @@ static int abortboot_single_key(int bootdelay)
ts = get_timer(0);
do {
if (tstc()) { /* we got a key press */
+ int key;
+
abort = 1; /* don't auto boot */
bootdelay = 0; /* no more delay*/
-# ifdef CONFIG_USE_AUTOBOOT_MENUKEY
- menukey = getc();
-# else
- (void) getc(); /* consume input*/
-# endif
+ key = getc(); /* consume input */
+ if (IS_ENABLED(CONFIG_USE_AUTOBOOT_MENUKEY))
+ menukey = key;
break;
}
udelay(1);
@@ -358,11 +361,10 @@ void autoboot_command(const char *s)
#endif
}
-#ifdef CONFIG_USE_AUTOBOOT_MENUKEY
- if (menukey == CONFIG_AUTOBOOT_MENUKEY) {
+ if (IS_ENABLED(CONFIG_USE_AUTOBOOT_MENUKEY) &&
+ menukey == AUTOBOOT_MENUKEY) {
s = env_get("menucmd");
if (s)
run_command_list(s, -1, 0);
}
-#endif /* CONFIG_USE_AUTOBOOT_MENUKEY */
}
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 12/18] snow: Define CONFIG_AUTOBOOT_MENUKEY
This option is not used by any boards. To avoid needing to remove it as dead code, add it to 'snow'. Signed-off-by: Simon Glass --- Changes in v2: None configs/snow_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/snow_defconfig b/configs/snow_defconfig index f474409516..e5c7bdd6cc 100644 --- a/configs/snow_defconfig +++ b/configs/snow_defconfig @@ -18,6 +18,8 @@ CONFIG_SILENT_CONSOLE=y # CONFIG_SPL_FRAMEWORK is not set CONFIG_SPL_TEXT_BASE=0x02023400 CONFIG_SYS_PROMPT="snow # " +CONFIG_USE_AUTOBOOT_MENUKEY=y +CONFIG_AUTOBOOT_MENUKEY=33 CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -- 2.22.0.657.g960e92d24f-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 11/18] autoboot: Rename CONFIG_MENUKEY to CONFIG_AUTOBOOT_MENUKEY
Since this is part of the autoboot functionality, it makes sense to name
it with an AUTOBOOT prefix. No mainline boards use it so this should be
safe, and downstream boards will need to adjust.
Since this option is just an integer value, it really needs another option
to control whether the feature is enabled or not. Add a new
CONFIG_USE_AUTOBOOT_MENUKEY for that. This fits better with how things are
done with Kconfig, avoiding the need to use a specific value to disable
the feature.
Signed-off-by: Simon Glass
---
Changes in v2: None
cmd/Kconfig | 17 +
common/autoboot.c | 10 +-
configs/socfpga_vining_fpga_defconfig | 2 +-
doc/README.autoboot | 8
include/autoboot.h| 2 +-
scripts/config_whitelist.txt | 1 -
6 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 37da17ff7f..d0c43c524a 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -153,6 +153,23 @@ config AUTOBOOT_STOP_STR_SHA256
string / password matches a values that is encypted via
a SHA256 hash and saved in the environment.
+config AUTOBOOT_USE_MENUKEY
+ bool "Allow a specify key to run a menu from the environment"
+ depends on !AUTOBOOT_KEYED
+ help
+ If a specific key is pressed to stop autoboot, then the commands in
+ the environment variable 'menucmd' are executed before boot starts.
+
+config AUTOBOOT_MENUKEY
+ int "ASCII value of boot key to show a menu"
+ default 0
+ depends on AUTOBOOT_USE_MENUKEY
+ help
+ If this key is pressed to stop autoboot, then the commands in the
+ environment variable 'menucmd' will be executed before boot starts.
+ For example, 33 means "!" in ASCII, so pressing ! at boot would take
+ this action.
+
endmenu
config BUILD_BIN2C
diff --git a/common/autoboot.c b/common/autoboot.c
index a6071ab839..ad189a8ba2 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -224,7 +224,7 @@ static int abortboot_key_sequence(int bootdelay)
return abort;
}
-#ifdef CONFIG_MENUKEY
+#ifdef CONFIG_USE_AUTOBOOT_MENUKEY
static int menukey;
#endif
@@ -252,7 +252,7 @@ static int abortboot_single_key(int bootdelay)
if (tstc()) { /* we got a key press */
abort = 1; /* don't auto boot */
bootdelay = 0; /* no more delay*/
-# ifdef CONFIG_MENUKEY
+# ifdef CONFIG_USE_AUTOBOOT_MENUKEY
menukey = getc();
# else
(void) getc(); /* consume input*/
@@ -358,11 +358,11 @@ void autoboot_command(const char *s)
#endif
}
-#ifdef CONFIG_MENUKEY
- if (menukey == CONFIG_MENUKEY) {
+#ifdef CONFIG_USE_AUTOBOOT_MENUKEY
+ if (menukey == CONFIG_AUTOBOOT_MENUKEY) {
s = env_get("menucmd");
if (s)
run_command_list(s, -1, 0);
}
-#endif /* CONFIG_MENUKEY */
+#endif /* CONFIG_USE_AUTOBOOT_MENUKEY */
}
diff --git a/configs/socfpga_vining_fpga_defconfig
b/configs/socfpga_vining_fpga_defconfig
index 1a9323f822..9e86a23704 100644
--- a/configs/socfpga_vining_fpga_defconfig
+++ b/configs/socfpga_vining_fpga_defconfig
@@ -8,7 +8,7 @@ CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200"
# CONFIG_USE_BOOTCOMMAND is not set
CONFIG_USE_PREBOOT=y
-CONFIG_PREBOOT="setenv hostname vining-${unit_serial} ; setenv PS1
"${unit_ident} (${unit_serial}) => " ; if gpio input 78 ; then setenv bootdelay
10 ; setenv boottype rcvr ; else setenv bootdelay 5 ; setenv boottype norm ; fi"
+CONFIG_PREBOOT="setenv hostname vining-${unit_serial} ; setenv PS1
\"${unit_ident} (${unit_serial}) => \" ; if gpio input 78 ; then setenv
bootdelay 10 ; setenv boottype rcvr ; else setenv bootdelay 5 ; setenv boottype
norm ; fi"
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
diff --git a/doc/README.autoboot b/doc/README.autoboot
index de35f3093d..5e9a5e1cf7 100644
--- a/doc/README.autoboot
+++ b/doc/README.autoboot
@@ -152,3 +152,11 @@ What they do
(Only effective when CONFIG_BOOT_RETRY_TIME is also set)
After the countdown timed out, the board will be reset to restart
again.
+
+ CONFIG_AUTOBOOT_USE_MENUKEY
+ CONFIG_AUTOBOOT_MENUKEY
+
+ If this key is pressed to stop autoboot, then the commands in the
+ environment variable 'menucmd' will be executed before boot starts.
+ For example, 33 means "!" in ASCII, so pressing ! at boot would take
+ this action.
diff --git a/include/autoboot.h b/include/autoboot.h
index 3ebd6f90e3..ac8157e570 100644
--- a/include/autoboot.h
+++ b/include/autoboot.h
@@ -27,7 +27,7 @@ const char *bootdelay_process(void);
* autoboot_command() - run the autoboot command
*
* If enabled, run
[U-Boot] [PATCH v2 09/18] autoboot: Drop #ifdef CONFIG_AUTOBOOT_KEYED
At present we have two functions named __autoboot() which do different
things. This is confusing. Fix it by using if() instead of #ifdef for
selecting the functions, and renaming them to meaningful names.
Signed-off-by: Simon Glass
---
Changes in v2: None
common/autoboot.c | 17 -
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/common/autoboot.c b/common/autoboot.c
index 45df665676..012dd5797e 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -35,8 +35,6 @@ static int stored_bootdelay;
#define AUTOBOOT_STOP_STR_SHA256 ""
#endif
-#if defined(CONFIG_AUTOBOOT_KEYED)
-
/*
* Use a "constant-length" time compare function for this
* hash compare:
@@ -203,7 +201,7 @@ static int passwd_abort_key(uint64_t etime)
* Watch for 'delay' seconds for autoboot stop or autoboot delay string.
* returns: 0 - no key string, allow autoboot 1 - got key string, abort
*/
-static int __abortboot(int bootdelay)
+static int abortboot_key_sequence(int bootdelay)
{
int abort;
uint64_t etime = endtick(bootdelay);
@@ -226,13 +224,11 @@ static int __abortboot(int bootdelay)
return abort;
}
-# else /* !defined(CONFIG_AUTOBOOT_KEYED) */
-
#ifdef CONFIG_MENUKEY
static int menukey;
#endif
-static int __abortboot(int bootdelay)
+static int abortboot_single_key(int bootdelay)
{
int abort = 0;
unsigned long ts;
@@ -277,14 +273,17 @@ static int __abortboot(int bootdelay)
return abort;
}
-# endif/* CONFIG_AUTOBOOT_KEYED */
static int abortboot(int bootdelay)
{
int abort = 0;
- if (bootdelay >= 0)
- abort = __abortboot(bootdelay);
+ if (bootdelay >= 0) {
+ if (IS_ENABLED(CONFIG_AUTOBOOT_KEYED))
+ abort = abortboot_key_sequence(bootdelay);
+ else
+ abort = abortboot_single_key(bootdelay);
+ }
if (IS_ENABLED(CONFIG_SILENT_CONSOLE) && abort)
gd->flags &= ~GD_FLG_SILENT;
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 10/18] autoboot: Drop unused CONFIG_MENUPROMPT
This is not defined by any board. We could use CONFIG_AUTOBOOT_PROMPT
instead perhaps, but this depends on CONFIG_AUTOBOOT_KEYED which is not
used for the single-key case.
So let's just remove CONFIG_MENUPROMPT.
Signed-off-by: Simon Glass
---
Changes in v2: None
common/autoboot.c| 4
scripts/config_whitelist.txt | 1 -
2 files changed, 5 deletions(-)
diff --git a/common/autoboot.c b/common/autoboot.c
index 012dd5797e..a6071ab839 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -233,11 +233,7 @@ static int abortboot_single_key(int bootdelay)
int abort = 0;
unsigned long ts;
-#ifdef CONFIG_MENUPROMPT
- printf(CONFIG_MENUPROMPT);
-#else
printf("Hit any key to stop autoboot: %2d ", bootdelay);
-#endif
/*
* Check if key already pressed
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 7e6c9e3016..bd05b9c4da 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1142,7 +1142,6 @@ CONFIG_MEM_HOLE_16M
CONFIG_MEM_INIT_VALUE
CONFIG_MEM_REMAP
CONFIG_MENUKEY
-CONFIG_MENUPROMPT
CONFIG_MENU_SHOW
CONFIG_MFG_ENV_SETTINGS
CONFIG_MIIM_ADDRESS
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 08/18] autoboot: Use if() for CONFIG_SILENT_CONSOLE
Avoid an #ifdef in this function, to improve readability. Signed-off-by: Simon Glass --- Changes in v2: None common/autoboot.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/common/autoboot.c b/common/autoboot.c index f832808b71..45df665676 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -286,10 +286,8 @@ static int abortboot(int bootdelay) if (bootdelay >= 0) abort = __abortboot(bootdelay); -#ifdef CONFIG_SILENT_CONSOLE - if (abort) + if (IS_ENABLED(CONFIG_SILENT_CONSOLE) && abort) gd->flags &= ~GD_FLG_SILENT; -#endif return abort; } -- 2.22.0.657.g960e92d24f-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 07/18] autoboot: Improve docs for CONFIG_AUTOBOOT_ENCRYPTION
This option is not documented properly at present. Fix it.
Signed-off-by: Simon Glass
---
Changes in v2: None
README | 2 ++
cmd/Kconfig | 9 -
common/autoboot.c | 16
doc/README.autoboot | 15 +++
4 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/README b/README
index f513af0b67..a2aaba818d 100644
--- a/README
+++ b/README
@@ -3425,6 +3425,8 @@ List of environment variables (most likely not complete):
allowed for use by the bootm command. See also "bootm_low"
environment variable.
+ bootstopkeysha256, bootdelaykey, bootstopkey - See README.autoboot
+
updatefile - Location of the software update file on a TFTP server, used
by the automatic software update feature. Please refer to
documentation in doc/README.update for more details.
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 175c6ad9e3..37da17ff7f 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -101,7 +101,14 @@ config AUTOBOOT_PROMPT
config AUTOBOOT_ENCRYPTION
bool "Enable encryption in autoboot stopping"
depends on AUTOBOOT_KEYED
- default n
+ help
+ This option allows a string to be entered into U-Boot to stop the
+ autoboot. The string itself is hashed and compared against the hash
+ in the environment variable 'bootstopkeysha256'. If it matches then
+ boot stops and a command-line prompt is presented.
+
+ This provides a way to ship a secure production device which can also
+ be accessed at the U-Boot command line.
config AUTOBOOT_DELAY_STR
string "Delay autobooting via specific input key / string"
diff --git a/common/autoboot.c b/common/autoboot.c
index 5a0dac8d79..f832808b71 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -54,6 +54,14 @@ static int slow_equals(u8 *a, u8 *b, int len)
return diff == 0;
}
+/**
+ * passwd_abort_sha256() - check for a hashed key sequence to abort booting
+ *
+ * This checks for the user entering a SHA256 hash within a given time.
+ *
+ * @etime: Timeout value ticks (stop when get_ticks() reachs this)
+ * @return 0 if autoboot should continue, 1 if it should stop
+ */
static int passwd_abort_sha256(uint64_t etime)
{
const char *sha_env_str = env_get("bootstopkeysha256");
@@ -106,6 +114,14 @@ static int passwd_abort_sha256(uint64_t etime)
return abort;
}
+/**
+ * passwd_abort_key() - check for a key sequence to aborted booting
+ *
+ * This checks for the user entering a string within a given time.
+ *
+ * @etime: Timeout value ticks (stop when get_ticks() reachs this)
+ * @return 0 if autoboot should continue, 1 if it should stop
+ */
static int passwd_abort_key(uint64_t etime)
{
int abort = 0;
diff --git a/doc/README.autoboot b/doc/README.autoboot
index eeb7e4c662..de35f3093d 100644
--- a/doc/README.autoboot
+++ b/doc/README.autoboot
@@ -132,6 +132,21 @@ What they do
provides an escape sequence from the limited "password"
strings.
+ CONFIG_AUTOBOOT_ENCRYPTION
+
+ "bootstopkeysha256" environment variable
+
+ - Hash value of the input which unlocks the device and
+ stops autoboot.
+
+ This option allows a string to be entered into U-Boot to stop the
+ autoboot. The string itself is hashed and compared against the hash
+ in the environment variable 'bootstopkeysha256'. If it matches then
+ boot stops and a command-line prompt is presented.
+
+ This provides a way to ship a secure production device which can also
+ be accessed at the U-Boot command line.
+
CONFIG_RESET_TO_RETRY
(Only effective when CONFIG_BOOT_RETRY_TIME is also set)
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 06/18] autoboot: Drop #ifdef for CONFIG_AUTOBOOT_ENCRYPTION
Use if() instead for this option, renaming the two different
passwd_abort() functions to indicate their purpose.
Signed-off-by: Simon Glass
---
Changes in v2: None
common/autoboot.c | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/common/autoboot.c b/common/autoboot.c
index e3086e3828..5a0dac8d79 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -10,6 +10,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -35,7 +36,6 @@ static int stored_bootdelay;
#endif
#if defined(CONFIG_AUTOBOOT_KEYED)
-#if defined(CONFIG_AUTOBOOT_STOP_STR_SHA256)
/*
* Use a "constant-length" time compare function for this
@@ -54,7 +54,7 @@ static int slow_equals(u8 *a, u8 *b, int len)
return diff == 0;
}
-static int passwd_abort(uint64_t etime)
+static int passwd_abort_sha256(uint64_t etime)
{
const char *sha_env_str = env_get("bootstopkeysha256");
u8 sha_env[SHA256_SUM_LEN];
@@ -105,8 +105,8 @@ static int passwd_abort(uint64_t etime)
return abort;
}
-#else
-static int passwd_abort(uint64_t etime)
+
+static int passwd_abort_key(uint64_t etime)
{
int abort = 0;
struct {
@@ -182,7 +182,6 @@ static int passwd_abort(uint64_t etime)
return abort;
}
-#endif
/***
* Watch for 'delay' seconds for autoboot stop or autoboot delay string.
@@ -201,7 +200,10 @@ static int __abortboot(int bootdelay)
printf(CONFIG_AUTOBOOT_PROMPT, bootdelay);
# endif
- abort = passwd_abort(etime);
+ if (IS_ENABLED(CONFIG_AUTOBOOT_ENCRYPTION))
+ abort = passwd_abort_sha256(etime);
+ else
+ abort = passwd_abort_key(etime);
if (!abort)
debug_bootkeys("key timeout\n");
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 05/18] autoboot: Use CONFIG_AUTOBOOT_STOP_STR_SHA256 indirectly
This CONFIG option is only present if CONFIG_AUTOBOOT_ENCRYPTION is enabled so it cannot be used in code without that #ifdef. But we want to reduce the use of #ifdef in this file and in particular to avoid having two different functions both named passwd_abort() but which do different things. In preparation for this, create an intermediate value which is set to an empty string if there is no value for CONFIG_AUTOBOOT_STOP_STR_SHA256. Signed-off-by: Simon Glass --- Changes in v2: None common/autoboot.c | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/common/autoboot.c b/common/autoboot.c index 94133eaeda..e3086e3828 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -28,6 +28,12 @@ DECLARE_GLOBAL_DATA_PTR; /* Stored value of bootdelay, used by autoboot_command() */ static int stored_bootdelay; +#ifdef CONFIG_AUTOBOOT_ENCRYPTION +#define AUTOBOOT_STOP_STR_SHA256 CONFIG_AUTOBOOT_STOP_STR_SHA256 +#else +#define AUTOBOOT_STOP_STR_SHA256 "" +#endif + #if defined(CONFIG_AUTOBOOT_KEYED) #if defined(CONFIG_AUTOBOOT_STOP_STR_SHA256) @@ -61,7 +67,7 @@ static int passwd_abort(uint64_t etime) int ret; if (sha_env_str == NULL) - sha_env_str = CONFIG_AUTOBOOT_STOP_STR_SHA256; + sha_env_str = AUTOBOOT_STOP_STR_SHA256; /* * Generate the binary value from the environment hash value -- 2.22.0.657.g960e92d24f-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 03/18] Add CONFIG_USE_PREBOOT to boards that use CONFIG_PREBOOT
In order to use CONFIG_PREBOOT with Kconfig, CONFIG_USE_PREBOOT must be defined for each board. To prepare for conversion to Kconfig, add this. Signed-off-by: Simon Glass --- Changes in v2: None include/configs/MPC8349EMDS.h | 1 + include/configs/TQM834x.h | 1 + include/configs/am3517_crane.h| 1 + include/configs/am3517_evm.h | 1 + include/configs/apf27.h | 1 + include/configs/arndale.h | 1 + include/configs/bcmstb.h | 1 + include/configs/bk4r1.h | 1 + include/configs/bur_cfg_common.h | 1 + include/configs/cm_fx6.h | 1 + include/configs/conga-qeval20-qa3-e3845.h | 1 + include/configs/controlcenterdc.h | 1 + include/configs/dfi-bt700.h | 1 + include/configs/ds414.h | 1 + include/configs/gw_ventana.h | 1 + include/configs/hrcon.h | 1 + include/configs/ids8313.h | 1 + include/configs/m53menlo.h| 1 + include/configs/meesc.h | 1 + include/configs/meson64.h | 1 + include/configs/microblaze-generic.h | 3 ++- include/configs/mv-common.h | 1 + include/configs/mvebu_armada-37xx.h | 1 + include/configs/mvebu_armada-8k.h | 1 + include/configs/mx51evk.h | 1 + include/configs/mx53cx9020.h | 1 + include/configs/mx53loco.h| 1 + include/configs/mx6cuboxi.h | 1 + include/configs/nitrogen6x.h | 1 + include/configs/nokia_rx51.h | 1 + include/configs/omap3_beagle.h| 1 + include/configs/omap3_logic.h | 1 + include/configs/opos6uldev.h | 1 + include/configs/ot1200.h | 1 + include/configs/platinum.h| 1 + include/configs/qemu-arm.h| 1 + include/configs/rk3036_common.h | 1 + include/configs/rk3188_common.h | 1 + include/configs/rk322x_common.h | 1 + include/configs/rk3288_common.h | 1 + include/configs/rpi.h | 1 + include/configs/siemens-am33x-common.h| 1 + include/configs/socfpga_dbm_soc1.h| 1 + include/configs/socfpga_vining_fpga.h | 1 + include/configs/socrates.h| 1 + include/configs/strider.h | 1 + include/configs/sunxi-common.h| 1 + include/configs/tbs2910.h | 1 + include/configs/tegra-common-post.h | 1 + include/configs/theadorable-x86-common.h | 1 + include/configs/theadorable.h | 1 + include/configs/topic_miami.h | 1 + include/configs/turris_mox.h | 1 + include/configs/xpedite517x.h | 1 + include/configs/xpedite520x.h | 1 + include/configs/xpedite537x.h | 1 + include/configs/xpedite550x.h | 1 + include/configs/zmx25.h | 1 + include/configs/zynq-common.h | 1 + 59 files changed, 60 insertions(+), 1 deletion(-) diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 7640d7610d..b37f3a8727 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -347,6 +347,7 @@ #define CONFIG_LOADADDR80 /* default location for tftp and bootm */ +#define CONFIG_USE_PREBOOT #define CONFIG_PREBOOT "echo;" \ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \ "echo" diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index 0da34d05af..0c2df7ec03 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -236,6 +236,7 @@ /* default location for tftp and bootm */ #define CONFIG_LOADADDR40 +#define CONFIG_USE_PREBOOT #define CONFIG_PREBOOT "echo;" \ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \ "echo" diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index cacd799aa2..e9a9da3aed 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -72,6 +72,7 @@ #ifdef CONFIG_USB_MUSB_HCD #ifdef CONFIG_USB_KEYBOARD +#define CONFIG_USE_PREBOOT #define CONFIG_PREBOOT "usb start" #endif /* CONFIG_USB_KEYBOARD */ diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index e0521abe90..841e750b00 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -33,6 +33,7 @@ #ifdef CONFIG_USB_MUSB_HOST #ifdef CONFIG_USB_KEYBOARD +#define CONFIG_USE_PREBOOT #define CONFIG_PREBOOT "usb start" #endif /* CONFIG_USB_KEYBOARD */ diff --git a/include/configs/apf27.h b/include/configs/apf27.h index b7a7ec5ee0..d7af4f91bc 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -83,6 +83,7 @@ #define CONFIG_SYS_CBSIZE 2048
[U-Boot] [PATCH v2 02/18] Convert CONFIG_SHOW_BOOT_PROGRESS to Kconfig
This converts the following to Kconfig: CONFIG_SHOW_BOOT_PROGRESS Signed-off-by: Simon Glass --- Changes in v2: None README| 165 -- common/Kconfig| 162 + configs/am335x_shc_defconfig | 1 + configs/am335x_shc_ict_defconfig | 1 + configs/am335x_shc_netboot_defconfig | 1 + configs/am335x_shc_sdboot_defconfig | 1 + configs/bayleybay_defconfig | 1 + configs/cherryhill_defconfig | 1 + configs/chromebook_link64_defconfig | 1 + configs/chromebook_link_defconfig | 1 + configs/chromebook_samus_defconfig| 1 + configs/chromebook_samus_tpl_defconfig| 1 + configs/chromebox_panther_defconfig | 1 + ...-qeval20-qa3-e3845-internal-uart_defconfig | 1 + configs/conga-qeval20-qa3-e3845_defconfig | 1 + configs/coreboot_defconfig| 1 + configs/cougarcanyon2_defconfig | 1 + configs/crownbay_defconfig| 1 + configs/dfi-bt700-q7x-151_defconfig | 1 + configs/efi-x86_app_defconfig | 1 + configs/efi-x86_payload32_defconfig | 1 + configs/efi-x86_payload64_defconfig | 1 + configs/galileo_defconfig | 1 + configs/lschlv2_defconfig | 1 + configs/lsxhl_defconfig | 1 + configs/minnowmax_defconfig | 1 + configs/qemu-x86_64_defconfig | 1 + configs/qemu-x86_defconfig| 1 + configs/som-db5800-som-6867_defconfig | 1 + ...able-x86-conga-qa3-e3845-pcie-x4_defconfig | 1 + .../theadorable-x86-conga-qa3-e3845_defconfig | 1 + configs/theadorable-x86-dfi-bt700_defconfig | 1 + configs/xtfpga_defconfig | 1 + include/configs/MigoR.h | 1 - include/configs/am335x_shc.h | 2 - include/configs/armadillo-800eva.h| 2 - include/configs/kzm9g.h | 2 - include/configs/lsxl.h| 1 - include/configs/rcar-gen2-common.h| 2 - include/configs/rcar-gen3-common.h| 2 - include/configs/sbc8548.h | 2 - include/configs/sh7752evb.h | 1 - include/configs/sh7753evb.h | 1 - include/configs/sh7757lcr.h | 1 - include/configs/sh7763rdp.h | 1 - include/configs/x86-common.h | 1 - include/configs/xtfpga.h | 1 - scripts/config_whitelist.txt | 1 - 48 files changed, 193 insertions(+), 186 deletions(-) diff --git a/README b/README index 8f816ad2af..f513af0b67 100644 --- a/README +++ b/README @@ -2138,171 +2138,6 @@ The following options need to be configured: A better solution is to properly configure the firewall, but sometimes that is not allowed. -- Show boot progress: - CONFIG_SHOW_BOOT_PROGRESS - - Defining this option allows to add some board- - specific code (calling a user-provided function - "show_boot_progress(int)") that enables you to show - the system's boot progress on some display (for - example, some LED's) on your board. At the moment, - the following checkpoints are implemented: - - -Legacy uImage format: - - Arg Where When -1 common/cmd_bootm.c before attempting to boot an image - -1 common/cmd_bootm.c Image header has bad magic number -2 common/cmd_bootm.c Image header has correct magic number - -2 common/cmd_bootm.c Image header has bad checksum -3 common/cmd_bootm.c Image header has correct checksum - -3 common/cmd_bootm.c Image data has bad checksum -4 common/cmd_bootm.c Image data has correct checksum - -4 common/cmd_bootm.c Image is for unsupported architecture -5 common/cmd_bootm.c Architecture check OK - -5 common/cmd_bootm.c Wrong Image Type (not kernel, multi) -6 common/cmd_bootm.c Image Type check OK - -6 common/cmd_bootm.c gunzip uncompression error - -7 common/cmd_bootm.c Unimplemented compression type -7 common/cmd_bootm.c Uncompression OK -8 common/cmd_bootm.c No uncompress/copy overwrite error - -9 common/cmd_bootm.c Unsupported OS (not Linux, BSD, VxWorks, QNX) - -9 common/image.c Start initial ramdisk verification - -10 common/image.c Ramdisk header has bad magic number - -11 common/image.c Ramdisk header has bad checksum - 10 common/image.c Ramdisk header is OK - -12 common/image.c Ramdisk data
[U-Boot] [PATCH v2 01/18] main: Use conditional run_preboot_environment_command()
The function name indicates that it does something, but its entire
operation is actually condition on a CONFIG. Move the condition outside
the function so this is clearer, and use if() instead of #ifdef, like the
reset of the file.
Signed-off-by: Simon Glass
---
Changes in v2: None
common/main.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/common/main.c b/common/main.c
index 07b34bf2b0..ce39c8d189 100644
--- a/common/main.c
+++ b/common/main.c
@@ -19,7 +19,6 @@ __weak void show_boot_progress(int val) {}
static void run_preboot_environment_command(void)
{
-#ifdef CONFIG_PREBOOT
char *p;
p = env_get("preboot");
@@ -34,7 +33,6 @@ static void run_preboot_environment_command(void)
if (IS_ENABLED(CONFIG_AUTOBOOT_KEYED))
disable_ctrlc(prev);/* restore Ctrl-C checking */
}
-#endif /* CONFIG_PREBOOT */
}
/* We come here after U-Boot is initialised and ready to process commands */
@@ -49,7 +47,8 @@ void main_loop(void)
cli_init();
- run_preboot_environment_command();
+ if (IS_ENABLED(CONFIG_USE_PREBOOT))
+ run_preboot_environment_command();
if (IS_ENABLED(CONFIG_UPDATE_TFTP))
update_tftp(0UL, NULL, NULL);
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 00/18] autoboot: Tidy up autoboot code
This series cleans up autoboot.c a bit to: - Convert options to Kconfig - Use C code instead of C preprocessor where possible - Add a few comments Changes in v2: - Rebase to master Simon Glass (18): main: Use conditional run_preboot_environment_command() Convert CONFIG_SHOW_BOOT_PROGRESS to Kconfig Add CONFIG_USE_PREBOOT to boards that use CONFIG_PREBOOT Convert CONFIG_USE_PREBOOT and CONFIG_PREBOOT to Kconfig autoboot: Use CONFIG_AUTOBOOT_STOP_STR_SHA256 indirectly autoboot: Drop #ifdef for CONFIG_AUTOBOOT_ENCRYPTION autoboot: Improve docs for CONFIG_AUTOBOOT_ENCRYPTION autoboot: Use if() for CONFIG_SILENT_CONSOLE autoboot: Drop #ifdef CONFIG_AUTOBOOT_KEYED autoboot: Drop unused CONFIG_MENUPROMPT autoboot: Rename CONFIG_MENUKEY to CONFIG_AUTOBOOT_MENUKEY snow: Define CONFIG_AUTOBOOT_MENUKEY autoboot: Tidy up use of menukey autoboot: Rename CONFIG_MENU_SHOW to include AUTOBOOT Convert CONFIG_AUTOBOOT_MENU_SHOW to Kconfig autoboot: Add comments for menu_show() autoboot: Move a few more options from #ifdef to if() autoboot: Adjust the implementation in autoboot_command() README| 167 +- cmd/Kconfig | 34 +++- cmd/bootmenu.c| 2 +- common/Kconfig| 162 + common/autoboot.c | 121 +++-- common/main.c | 5 +- configs/A10-OLinuXino-Lime_defconfig | 1 + configs/A10s-OLinuXino-M_defconfig| 1 + configs/A13-OLinuXinoM_defconfig | 1 + configs/A13-OLinuXino_defconfig | 1 + configs/A20-OLinuXino-Lime2-eMMC_defconfig| 1 + configs/A20-OLinuXino-Lime2_defconfig | 1 + configs/A20-OLinuXino-Lime_defconfig | 1 + configs/A20-OLinuXino_MICRO-eMMC_defconfig| 1 + configs/A20-OLinuXino_MICRO_defconfig | 1 + configs/A20-Olimex-SOM-EVB_defconfig | 1 + configs/A20-Olimex-SOM204-EVB-eMMC_defconfig | 1 + configs/A20-Olimex-SOM204-EVB_defconfig | 1 + configs/A33-OLinuXino_defconfig | 1 + configs/Ainol_AW1_defconfig | 1 + configs/Ampe_A76_defconfig| 1 + configs/Auxtek-T003_defconfig | 1 + configs/Auxtek-T004_defconfig | 1 + configs/Bananapi_M2_Ultra_defconfig | 1 + configs/Bananapi_defconfig| 1 + configs/Bananapi_m2m_defconfig| 1 + configs/Bananapro_defconfig | 1 + configs/CHIP_defconfig| 1 + configs/CHIP_pro_defconfig| 1 + configs/CSQ_CS908_defconfig | 1 + configs/Chuwi_V7_CW0825_defconfig | 1 + configs/Colombus_defconfig| 1 + configs/Cubieboard2_defconfig | 1 + configs/Cubieboard4_defconfig | 1 + configs/Cubieboard_defconfig | 1 + configs/Cubietruck_defconfig | 1 + configs/Cubietruck_plus_defconfig | 1 + configs/Empire_electronix_d709_defconfig | 1 + configs/Empire_electronix_m712_defconfig | 1 + configs/Hummingbird_A31_defconfig | 1 + configs/Hyundai_A7HD_defconfig| 1 + configs/Itead_Ibox_A20_defconfig | 1 + configs/Lamobo_R1_defconfig | 1 + configs/LicheePi_Zero_defconfig | 1 + configs/Linksprite_pcDuino3_Nano_defconfig| 1 + configs/Linksprite_pcDuino3_defconfig | 1 + configs/Linksprite_pcDuino_defconfig | 1 + configs/MK808C_defconfig | 1 + configs/MPC8349EMDS_PCI64_defconfig | 2 + configs/MPC8349EMDS_SLAVE_defconfig | 2 + configs/MPC8349EMDS_defconfig | 2 + configs/MSI_Primo73_defconfig | 1 + configs/MSI_Primo81_defconfig | 1 + configs/Marsboard_A10_defconfig | 1 + configs/Mele_A1000G_quad_defconfig| 1 + configs/Mele_A1000_defconfig | 1 + configs/Mele_I7_defconfig | 1 + configs/Mele_M3_defconfig | 1 + configs/Mele_M5_defconfig | 1 + configs/Mele_M9_defconfig | 1 + configs/Merrii_A80_Optimus_defconfig | 1 + configs/Mini-X_defconfig | 1 + .../Nintendo_NES_Classic_Edition_defconfig| 1 + configs/Orangepi_defconfig| 1 + configs/Orangepi_mini_defconfig | 1 + configs/Sinlinx_SinA31s_defconfig | 1 + configs/Sinlinx_SinA33_defconfig | 1 + configs/Sinovoip_BPI_M2_defconfig | 1 + configs/Sinovoip_BPI_M3_defconfig | 1 +
Re: [U-Boot] [PATCH 4/4] dm: Fix parameter description of dev_read_name()
On Fri, 5 Jul 2019 at 10:23, Bin Meng wrote: > > The comments of dev_read_name() wrongly describe "node" as its > parameter. > > Signed-off-by: Bin Meng > --- > > include/dm/read.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > Reviewed-by: Simon Glass Applied to u-boot-dm, thanks! ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] fdt: make fdt_get_base_address() return OF_BAD_ADDR when "reg" not found
On Thu, Jun 27, 2019 at 3:40 PM Masahiro Yamada wrote: > > Currently, fdt_get_base_address() returns 0 if the "reg" property is > missing. Since 0 is a valid value, it is not suitable for the error > handling. Return OF_BAD_ADDR instead. > > Signed-off-by: Masahiro Yamada > --- > > common/fdt_support.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot Applied to u-boot-dm, thanks! ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 1/4] dm: timer: Skip device that does not have a valid ofnode in pre_probe()
On Fri, 5 Jul 2019 at 10:23, Bin Meng wrote: > > It is possible that a timer device has a null ofnode, hence there is > no need to further parse DT for the clock rate. > > Signed-off-by: Bin Meng > --- > > drivers/timer/timer-uclass.c | 4 > 1 file changed, 4 insertions(+) Reviewed-by: Simon Glass Applied to u-boot-dm, thanks! ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 3/4] dm: core: Set correct "status" value for a node
On Fri, 5 Jul 2019 at 10:23, Bin Meng wrote: > > Per device tree spec, "status" property can have a value of "okay", > or "disabled", but not "disable". > > Signed-off-by: Bin Meng > --- > > drivers/core/ofnode.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > Reviewed-by: Simon Glass Applied to u-boot-dm, thanks! ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 2/4] dm: core: Call clk_set_defaults() during probe() only for a valid ofnode
On Fri, 5 Jul 2019 at 10:23, Bin Meng wrote: > > Without a valid ofnode, it's meaningless to call clk_set_defaults() > to process various properties. > > Signed-off-by: Bin Meng > --- > > drivers/core/device.c | 14 ++ > 1 file changed, 10 insertions(+), 4 deletions(-) Reviewed-by: Simon Glass Applied to u-boot-dm, thanks! ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] common: fdt_support: Add missing cpu_to_fdt32() to fdt_pci_dma_ranges()
On 7/9/19 2:49 AM, Marek Vasut wrote: > The fdt_pci_dma_ranges() cannot work on e.g. ARM, since the DT entries > endianness is not adjusted at all. Fix this. > > Signed-off-by: Marek Vasut > Cc: Tom Rini +CC Simon > --- > common/fdt_support.c | 25 ++--- > 1 file changed, 14 insertions(+), 11 deletions(-) > Applied to u-boot-dm, thanks! ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] dm: uclass: fix comment copy/paste error
On Thu, 11 Jul 2019 at 02:23, Baruch Siach wrote: > > The uclass_next_device() routine continues a previously started device > iteration. Change the description that is copied from > uclass_first_device(). > > Signed-off-by: Baruch Siach > --- > include/dm/uclass.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Simon Glass Applied to u-boot-dm, thanks! ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] dm: device: make power domain calls optional
> Subject: [PATCH] dm: device: make power domain calls optional > > Reduce power domain calls when CONFIG_POWER_DOMAIN is disabled. > With gcc v8.2, this change saves 104 bytes. > > Signed-off-by: Anatolij Gustschin > --- > drivers/core/device.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > Applied to u-boot-dm, thanks! ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] buildman: fix invocation examples typos
Also, make command line example indentation consistent. Signed-off-by: Baruch Siach --- tools/buildman/README | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Applied to u-boot-dm, thanks! ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] clk: initialize clk->data when using default xlate
Right now when using clk_of_xlate_default(), clk->data remains un-initialized because clk_get_bulk() does not initialize memory on allocation of clock structure. This can cause problems when data is used to match if two clocks pointers are exactly the same underlying clocks, for example. Fix it by initializing clk->data to 0. Suggested-by: Lokesh Vutla Signed-off-by: Sekhar Nori --- drivers/clk/clk-uclass.c | 2 ++ 1 file changed, 2 insertions(+) Applied to u-boot-dm, thanks! ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] doc: Move fastboot protocol doc to android dir
On Sat, Jul 20, 2019 at 12:45 AM Eugeniu Rosca wrote: > > On Fri, Jul 19, 2019 at 05:36:14PM +0300, Sam Protsenko wrote: > > > You can check my android-next branch [1] to check all patches I > > collected for sending (and my current work on top of it). > > > > [1] https://github.com/joe-skb7/u-boot-misc/commits/android-next > > It looks like we'll be able to dump the contents and fetch the > meta-information of boot.img in the nearest future. Very cool. Thanks > for the efforts. > Actually we are already able to dump the contents of image using "iminfo" command (once boot image is loaded to $loadaddr). But yeah, I'm basically trying to implement new boot scheme, for Android Boot Image v2. Not sure if I'll be in time before merge window closes, though. So it will be probably posted for next merge window, along with other boot flow stuff. > -- > Best Regards, > Eugeniu. ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 48/53] binman: Clean up all output directories in tests
At present some tests leave behind output directories. This happens
because some tests call binman, which sets up an output directory, then
call it again, which sets up another output directory and leaves the
original one behind.
Fix this by using a separate temporary directory when binman is called
twice, or by manually removing the output directory.
Signed-off-by: Simon Glass
---
tools/binman/ftest.py | 51 +++
1 file changed, 42 insertions(+), 9 deletions(-)
diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index a490d394d86..e2246d80f8a 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -203,6 +203,28 @@ class TestFunctional(unittest.TestCase):
"""Remove the temporary output directory"""
self._CleanupOutputDir()
+def _SetupImageInTmpdir(self):
+"""Set up the output image in a new temporary directory
+
+This is used when an image has been generated in the output directory,
+but we want to run binman again. This will create a new output
+directory and fail to delete the original one.
+
+This creates a new temporary directory, copies the image to it (with a
+new name) and removes the old output directory.
+
+Returns:
+Tuple:
+Temporary directory to use
+New image filename
+"""
+image_fname = tools.GetOutputFilename('image.bin')
+tmpdir = tempfile.mkdtemp(prefix='binman.')
+updated_fname = os.path.join(tmpdir, 'image-updated.bin')
+tools.WriteFile(updated_fname, tools.ReadFile(image_fname))
+self._CleanupOutputDir()
+return tmpdir, updated_fname
+
@classmethod
def _ResetDtbs(self):
TestFunctional._MakeInputFile('u-boot.dtb', U_BOOT_DTB_DATA)
@@ -1563,6 +1585,7 @@ class TestFunctional(unittest.TestCase):
self.assertFalse(os.path.exists(tools.GetOutputFilename('image1.bin')))
self.assertTrue(os.path.exists(tools.GetOutputFilename('image2.bin')))
+self._CleanupOutputDir()
def testUpdateFdtAll(self):
"""Test that all device trees are updated with offset/size info"""
@@ -2364,9 +2387,12 @@ class TestFunctional(unittest.TestCase):
fdt_size = entries['section'].GetEntries()['u-boot-dtb'].size
fdtmap_offset = entries['fdtmap'].offset
-image_fname = tools.GetOutputFilename('image.bin')
-with test_util.capture_sys_output() as (stdout, stderr):
-self._DoBinman('ls', '-i', image_fname)
+try:
+tmpdir, updated_fname = self._SetupImageInTmpdir()
+with test_util.capture_sys_output() as (stdout, stderr):
+self._DoBinman('ls', '-i', updated_fname)
+finally:
+shutil.rmtree(tmpdir)
lines = stdout.getvalue().splitlines()
expected = [
'Name Image-pos Size Entry-typeOffset Uncomp-size',
@@ -2387,9 +2413,12 @@ class TestFunctional(unittest.TestCase):
def testListCmdFail(self):
"""Test failing to list an image"""
self._DoReadFile('005_simple.dts')
-image_fname = tools.GetOutputFilename('image.bin')
-with self.assertRaises(ValueError) as e:
-self._DoBinman('ls', '-i', image_fname)
+try:
+tmpdir, updated_fname = self._SetupImageInTmpdir()
+with self.assertRaises(ValueError) as e:
+self._DoBinman('ls', '-i', updated_fname)
+finally:
+shutil.rmtree(tmpdir)
self.assertIn("Cannot find FDT map in image", str(e.exception))
def _RunListCmd(self, paths, expected):
@@ -2515,10 +2544,14 @@ class TestFunctional(unittest.TestCase):
"""Test extracting a file fron an image on the command line"""
self._CheckLz4()
self._DoReadFileRealDtb('130_list_fdtmap.dts')
-image_fname = tools.GetOutputFilename('image.bin')
fname = os.path.join(self._indir, 'output.extact')
-with test_util.capture_sys_output() as (stdout, stderr):
-self._DoBinman('extract', '-i', image_fname, 'u-boot', '-f', fname)
+try:
+tmpdir, updated_fname = self._SetupImageInTmpdir()
+with test_util.capture_sys_output() as (stdout, stderr):
+self._DoBinman('extract', '-i', updated_fname, 'u-boot',
+ '-f', fname)
+finally:
+shutil.rmtree(tmpdir)
data = tools.ReadFile(fname)
self.assertEqual(U_BOOT_DATA, data)
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 51/53] binman: Split control.WriteEntryToImage() into separate functions
This code has three distinct phases:
1. The image is loaded and the state module is set up
2. The entry is written to the image
3. The image is repacked and written back to the file
Split the code out with three separate functions, one for each phase.
Signed-off-by: Simon Glass
---
tools/binman/control.py | 76 -
1 file changed, 59 insertions(+), 17 deletions(-)
diff --git a/tools/binman/control.py b/tools/binman/control.py
index 9a706305c38..232a38d9847 100644
--- a/tools/binman/control.py
+++ b/tools/binman/control.py
@@ -169,6 +169,62 @@ def ExtractEntries(image_fname, output_fname, outdir,
entry_paths,
return einfos
+def BeforeReplace(image, allow_resize):
+"""Handle getting an image ready for replacing entries in it
+
+Args:
+image: Image to prepare
+"""
+state.PrepareFromLoadedData(image)
+image.LoadData()
+
+# If repacking, drop the old offset/size values except for the original
+# ones, so we are only left with the constraints.
+if allow_resize:
+image.ResetForPack()
+
+
+def ReplaceOneEntry(image, entry, data, do_compress, allow_resize):
+"""Handle replacing a single entry an an image
+
+Args:
+image: Image to update
+entry: Entry to write
+data: Data to replace with
+do_compress: True to compress the data if needed, False if data is
+already compressed so should be used as is
+allow_resize: True to allow entries to change size (this does a re-pack
+of the entries), False to raise an exception
+"""
+if not entry.WriteData(data, do_compress):
+if not image.allow_repack:
+entry.Raise('Entry data size does not match, but allow-repack is
not present for this image')
+if not allow_resize:
+entry.Raise('Entry data size does not match, but resize is
disabled')
+
+
+def AfterReplace(image, allow_resize, write_map):
+"""Handle write out an image after replacing entries in it
+
+Args:
+image: Image to write
+allow_resize: True to allow entries to change size (this does a re-pack
+of the entries), False to raise an exception
+write_map: True to write a map file
+"""
+tout.Info('Processing image')
+ProcessImage(image, update_fdt=True, write_map=write_map,
+ get_contents=False, allow_resize=allow_resize)
+
+
+def WriteEntryToImage(image, entry, data, do_compress=True, allow_resize=True,
+ write_map=False):
+BeforeReplace(image, allow_resize)
+tout.Info('Writing data to %s' % entry.GetPath())
+ReplaceOneEntry(image, entry, data, do_compress, allow_resize)
+AfterReplace(image, allow_resize=allow_resize, write_map=write_map)
+
+
def WriteEntry(image_fname, entry_path, data, do_compress=True,
allow_resize=True, write_map=False):
"""Replace an entry in an image
@@ -189,26 +245,12 @@ def WriteEntry(image_fname, entry_path, data,
do_compress=True,
Returns:
Image object that was updated
"""
-tout.Info("WriteEntry '%s', file '%s'" % (entry_path, image_fname))
+tout.Info("Write entry '%s', file '%s'" % (entry_path, image_fname))
image = Image.FromFile(image_fname)
entry = image.FindEntryPath(entry_path)
-state.PrepareFromLoadedData(image)
-image.LoadData()
+WriteEntryToImage(image, entry, data, do_compress=do_compress,
+ allow_resize=allow_resize, write_map=write_map)
-# If repacking, drop the old offset/size values except for the original
-# ones, so we are only left with the constraints.
-if allow_resize:
-image.ResetForPack()
-tout.Info('Writing data to %s' % entry.GetPath())
-if not entry.WriteData(data, do_compress):
-if not image.allow_repack:
-entry.Raise('Entry data size does not match, but allow-repack is
not present for this image')
-if not allow_resize:
-entry.Raise('Entry data size does not match, but resize is
disabled')
-tout.Info('Processing image')
-ProcessImage(image, update_fdt=True, write_map=False, get_contents=False,
- allow_resize=allow_resize)
-tout.Info('WriteEntry done')
return image
def PrepareImagesAndDtbs(dtb_fname, select_images, update_fdt):
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 26/53] binman: Allow the fdtmap to remain unchanged
When updating an existing image where the size of all entries remains the
same, we should not need to regenerate the fdtmap. Update the entry to
return the same fdtmap as was read from the image.
Signed-off-by: Simon Glass
---
tools/binman/etype/fdtmap.py | 55
1 file changed, 30 insertions(+), 25 deletions(-)
diff --git a/tools/binman/etype/fdtmap.py b/tools/binman/etype/fdtmap.py
index a55c9c899bf..1271b50036a 100644
--- a/tools/binman/etype/fdtmap.py
+++ b/tools/binman/etype/fdtmap.py
@@ -93,31 +93,36 @@ class Entry_fdtmap(Entry):
with fsw.add_node(subnode.name):
_AddNode(subnode)
-# Get the FDT data into an Fdt object
-data = state.GetFdtContents()[1]
-infdt = Fdt.FromData(data)
-infdt.Scan()
-
-# Find the node for the image containing the Fdt-map entry
-path = self.section.GetPath()
-self.Detail("Fdtmap: Using section '%s' (path '%s')" %
-(self.section.name, path))
-node = infdt.GetNode(path)
-if not node:
-self.Raise("Internal error: Cannot locate node for path '%s'" %
- path)
-
-# Build a new tree with all nodes and properties starting from that
node
-fsw = libfdt.FdtSw()
-fsw.finish_reservemap()
-with fsw.add_node(''):
-fsw.property_string('image-node', node.name)
-_AddNode(node)
-fdt = fsw.as_fdt()
-
-# Pack this new FDT and return its contents
-fdt.pack()
-outfdt = Fdt.FromData(fdt.as_bytearray())
+outfdt = self.GetImage().fdtmap_dtb
+# If we have an fdtmap it means that we are using this as the
+# read-only fdtmap for this image.
+if not outfdt:
+# Get the FDT data into an Fdt object
+data = state.GetFdtContents()[1]
+infdt = Fdt.FromData(data)
+infdt.Scan()
+
+# Find the node for the image containing the Fdt-map entry
+path = self.section.GetPath()
+self.Detail("Fdtmap: Using section '%s' (path '%s')" %
+(self.section.name, path))
+node = infdt.GetNode(path)
+if not node:
+self.Raise("Internal error: Cannot locate node for path '%s'" %
+ path)
+
+# Build a new tree with all nodes and properties starting from that
+# node
+fsw = libfdt.FdtSw()
+fsw.finish_reservemap()
+with fsw.add_node(''):
+fsw.property_string('image-node', node.name)
+_AddNode(node)
+fdt = fsw.as_fdt()
+
+# Pack this new FDT and return its contents
+fdt.pack()
+outfdt = Fdt.FromData(fdt.as_bytearray())
data = FDTMAP_MAGIC + tools.GetBytes(0, 8) + outfdt.GetContents()
return data
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 50/53] binman: Update control.WriteEntry() to support writing the map
Add the ability to write a new map file. Also tidy up a few comments and
rename a misleading variable.
Signed-off-by: Simon Glass
---
tools/binman/control.py | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/tools/binman/control.py b/tools/binman/control.py
index 23a3d558612..9a706305c38 100644
--- a/tools/binman/control.py
+++ b/tools/binman/control.py
@@ -128,7 +128,7 @@ def ExtractEntries(image_fname, output_fname, outdir,
entry_paths,
otherwise
outdir: Output directory to use (for any number of files), else None
entry_paths: List of entry paths to extract
-decomp: True to compress the entry data
+decomp: True to decompress the entry data
Returns:
List of EntryInfo records that were written
@@ -169,7 +169,8 @@ def ExtractEntries(image_fname, output_fname, outdir,
entry_paths,
return einfos
-def WriteEntry(image_fname, entry_path, data, decomp=True, allow_resize=True):
+def WriteEntry(image_fname, entry_path, data, do_compress=True,
+ allow_resize=True, write_map=False):
"""Replace an entry in an image
This replaces the data in a particular entry in an image. This size of the
@@ -179,10 +180,11 @@ def WriteEntry(image_fname, entry_path, data,
decomp=True, allow_resize=True):
image_fname: Image filename to process
entry_path: Path to entry to extract
data: Data to replace with
-decomp: True to compress the data if needed, False if data is
+do_compress: True to compress the data if needed, False if data is
already compressed so should be used as is
allow_resize: True to allow entries to change size (this does a re-pack
of the entries), False to raise an exception
+write_map: True to write a map file
Returns:
Image object that was updated
@@ -198,7 +200,7 @@ def WriteEntry(image_fname, entry_path, data, decomp=True,
allow_resize=True):
if allow_resize:
image.ResetForPack()
tout.Info('Writing data to %s' % entry.GetPath())
-if not entry.WriteData(data, decomp):
+if not entry.WriteData(data, do_compress):
if not image.allow_repack:
entry.Raise('Entry data size does not match, but allow-repack is
not present for this image')
if not allow_resize:
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 53/53] binman: Add command-line support for replacing entries
Add a 'replace' command to binman to permit entries to be replaced, either
individually or all at once (using a filter).
Signed-off-by: Simon Glass
---
tools/binman/README | 22 ++-
tools/binman/cmdline.py | 17 +++
tools/binman/control.py | 75 ++
tools/binman/ftest.py | 189 ++
tools/binman/test/143_replace_all.dts | 28
5 files changed, 327 insertions(+), 4 deletions(-)
create mode 100644 tools/binman/test/143_replace_all.dts
diff --git a/tools/binman/README b/tools/binman/README
index 5e8f9fd4808..b4f6392ab74 100644
--- a/tools/binman/README
+++ b/tools/binman/README
@@ -589,9 +589,24 @@ that there is an 'fdtmap' entry in the image. For example:
$ binman replace -i image.bin section/cbfs/u-boot
which will write the contents of the file 'u-boot' from the current directory
-to the that entry. If the entry size changes, you must add the 'allow-repack'
-property to the original image before generating it (see above), otherwise you
-will get an error.
+to the that entry, compressing if necessary. If the entry size changes, you
must
+add the 'allow-repack' property to the original image before generating it (see
+above), otherwise you will get an error.
+
+You can also use a particular file, in this case u-boot.bin:
+
+$ binman replace -i image.bin section/cbfs/u-boot -f u-boot.bin
+
+It is possible to replace all files from a source directory which uses the same
+hierarchy as the entries:
+
+$ binman replace -i image.bin -I indir
+
+Files that are missing will generate a warning.
+
+You can also replace just a selection of entries:
+
+$ binman replace -i image.bin "*u-boot*" -I indir
Logging
@@ -959,7 +974,6 @@ Some ideas:
- Allow easy building of images by specifying just the board name
- Support building an image for a board (-b) more completely, with a
configurable build directory
-- Support updating binaries in an image (with repacking)
- Support adding FITs to an image
- Support for ARM Trusted Firmware (ATF)
- Detect invalid properties in nodes
diff --git a/tools/binman/cmdline.py b/tools/binman/cmdline.py
index a43aec649ed..1e385935797 100644
--- a/tools/binman/cmdline.py
+++ b/tools/binman/cmdline.py
@@ -84,6 +84,23 @@ controlled by a description in the board device tree.'''
extract_parser.add_argument('-U', '--uncompressed', action='store_true',
help='Output raw uncompressed data for compressed entries')
+replace_parser = subparsers.add_parser('replace',
+ help='Replace entries in an image')
+replace_parser.add_argument('-C', '--compressed', action='store_true',
+help='Input data is already compressed if needed for the entry')
+replace_parser.add_argument('-i', '--image', type=str, required=True,
+help='Image filename to extract')
+replace_parser.add_argument('-f', '--filename', type=str,
+help='Input filename to read from')
+replace_parser.add_argument('-F', '--fix-size', action='store_true',
+help="Don't allow entries to be resized")
+replace_parser.add_argument('-I', '--indir', type=str, default='',
+help='Path to directory to use for input files')
+replace_parser.add_argument('-m', '--map', action='store_true',
+default=False, help='Output a map file for the updated image')
+replace_parser.add_argument('paths', type=str, nargs='*',
+help='Paths within file to extract (wildcard)')
+
test_parser = subparsers.add_parser('test', help='Run tests')
test_parser.add_argument('-P', '--processes', type=int,
help='set number of processes to use for running tests')
diff --git a/tools/binman/control.py b/tools/binman/control.py
index e6722c94593..9e7587864ce 100644
--- a/tools/binman/control.py
+++ b/tools/binman/control.py
@@ -253,6 +253,71 @@ def WriteEntry(image_fname, entry_path, data,
do_compress=True,
return image
+
+def ReplaceEntries(image_fname, input_fname, indir, entry_paths,
+ do_compress=True, allow_resize=True, write_map=False):
+"""Replace the data from one or more entries from input files
+
+Args:
+image_fname: Image filename to process
+input_fname: Single input ilename to use if replacing one file, None
+otherwise
+indir: Input directory to use (for any number of files), else None
+entry_paths: List of entry paths to extract
+do_compress: True if the input data is uncompressed and may need to be
+compressed if the entry requires it, False if the data is already
+compressed.
+write_map: True to write a map file
+
+Returns:
+List of EntryInfo records that were written
+"""
+image = Image.FromFile(image_fname)
+
+# Replace an entry from a single file, as a special case
+if
[U-Boot] [PATCH 12/53] binman: Drop state.fdt_set as this is not needed
We can iterate through the output files so don't need this global anymore.
Remove it.
Signed-off-by: Simon Glass
---
tools/binman/state.py | 13 +++--
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/tools/binman/state.py b/tools/binman/state.py
index 46c1c8d613a..7c3a987723e 100644
--- a/tools/binman/state.py
+++ b/tools/binman/state.py
@@ -28,13 +28,6 @@ entry_args = {}
# ftest.py)
use_fake_dtb = False
-# Dict of device trees, keyed by entry type. These are the input device trees,
-# before any modification by U-Boot
-# The value is as returned by Entry.GetFdts(), i.e. a tuple:
-# Fdt object for this dtb, or None if not available
-# Filename of file containing this dtb
-fdt_set = {}
-
# The DTB which contains the full image information
main_dtb = None
@@ -136,7 +129,7 @@ def Prepare(images, dtb):
images: List of images being used
dtb: Main dtb
"""
-global fdt_set, output_fdt_files, main_dtb
+global output_fdt_files, main_dtb
# Import these here in case libfdt.py is not available, in which case
# the above help option still works.
import fdt
@@ -151,8 +144,8 @@ def Prepare(images, dtb):
output_fdt_files['u-boot-dtb'] = [dtb, 'u-boot.dtb']
output_fdt_files['u-boot-spl-dtb'] = [dtb, 'spl/u-boot-spl.dtb']
output_fdt_files['u-boot-tpl-dtb'] = [dtb, 'tpl/u-boot-tpl.dtb']
-fdt_set = {}
if not use_fake_dtb:
+fdt_set = {}
for image in images.values():
fdt_set.update(image.GetFdts())
for etype, other in fdt_set.items():
@@ -172,7 +165,7 @@ def GetAllFdts():
Device trees being used (U-Boot proper, SPL, TPL)
"""
yield main_dtb
-for etype in fdt_set:
+for etype in output_fdt_files:
dtb = output_fdt_files[etype][0]
if dtb != main_dtb:
yield dtb
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 22/53] binman: Add an image name into the fdtmap
Since binman supports multiple images it is useful to know which one
created the image that has been read. Then it is possible to look up that
name in the 'master' device tree (containing the description of all
images).
Add a property for this.
Signed-off-by: Simon Glass
---
tools/binman/etype/fdtmap.py | 2 ++
tools/binman/ftest.py| 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/binman/etype/fdtmap.py b/tools/binman/etype/fdtmap.py
index 229b4a1bb69..a55c9c899bf 100644
--- a/tools/binman/etype/fdtmap.py
+++ b/tools/binman/etype/fdtmap.py
@@ -60,6 +60,7 @@ class Entry_fdtmap(Entry):
Example output for a simple image with U-Boot and an FDT map:
/ {
+image-name = "binman";
size = <0x0112>;
image-pos = <0x>;
offset = <0x>;
@@ -110,6 +111,7 @@ class Entry_fdtmap(Entry):
fsw = libfdt.FdtSw()
fsw.finish_reservemap()
with fsw.add_node(''):
+fsw.property_string('image-node', node.name)
_AddNode(node)
fdt = fsw.as_fdt()
diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index 6a40d1fdbb4..08a1df03077 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -2369,7 +2369,7 @@ class TestFunctional(unittest.TestCase):
' u-boot138 4 u-boot38',
' u-boot-dtb180 10f u-boot-dtb80 3c9',
'u-boot-dtb 500 %x u-boot-dtb 400 3c9' %
fdt_size,
-' fdtmap%x 395 fdtmap %x' %
+' fdtmap%x 3b4 fdtmap %x' %
(fdtmap_offset, fdtmap_offset),
' image-header bf8 8 image-header bf8',
]
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 28/53] binman: Support updating entries in an existing image
While it is useful and efficient to build images in a single pass from a
unified description, it is sometimes desirable to update the image later.
Add support for replace an existing file with one of the same size. This
avoids needing to repack the file. Support for more advanced updates will
come in future patches.
Signed-off-by: Simon Glass
---
tools/binman/README | 13 ++-
tools/binman/control.py | 33 +++-
tools/binman/entry.py | 23 ++
tools/binman/ftest.py | 102 +++-
tools/binman/image.py | 3 +
tools/binman/state.py | 74 -
tools/binman/test/132_replace.dts | 21 +
tools/binman/test/133_replace_multi.dts | 33
8 files changed, 277 insertions(+), 25 deletions(-)
create mode 100644 tools/binman/test/132_replace.dts
create mode 100644 tools/binman/test/133_replace_multi.dts
diff --git a/tools/binman/README b/tools/binman/README
index 756c6a0010e..35223545194 100644
--- a/tools/binman/README
+++ b/tools/binman/README
@@ -557,6 +557,18 @@ or just a selection:
$ binman extract -i image.bin "*u-boot*" -O outdir
+Replacing files in an image
+---
+
+You can replace files in an existing firmware image created by binman, provided
+that there is an 'fdtmap' entry in the image. For example:
+
+$ binman replace -i image.bin section/cbfs/u-boot
+
+which will write the contents of the file 'u-boot' from the current directory
+to the that entry. The file must be the same size as the entry being replaced.
+
+
Logging
---
@@ -909,7 +921,6 @@ Some ideas:
- Allow easy building of images by specifying just the board name
- Support building an image for a board (-b) more completely, with a
configurable build directory
-- Support updating binaries in an image (with no size change / repacking)
- Support updating binaries in an image (with repacking)
- Support adding FITs to an image
- Support for ARM Trusted Firmware (ATF)
diff --git a/tools/binman/control.py b/tools/binman/control.py
index 8700f48ad55..ab94f9d4829 100644
--- a/tools/binman/control.py
+++ b/tools/binman/control.py
@@ -118,6 +118,32 @@ def ReadEntry(image_fname, entry_path, decomp=True):
return entry.ReadData(decomp)
+def WriteEntry(image_fname, entry_path, data, decomp=True):
+"""Replace an entry in an image
+
+This replaces the data in a particular entry in an image. This size of the
+new data must match the size of the old data
+
+Args:
+image_fname: Image filename to process
+entry_path: Path to entry to extract
+data: Data to replace with
+decomp: True to compress the data if needed, False if data is
+already compressed so should be used as is
+"""
+tout.Info("WriteEntry '%s', file '%s'" % (entry_path, image_fname))
+image = Image.FromFile(image_fname)
+entry = image.FindEntryPath(entry_path)
+state.PrepareFromLoadedData(image)
+image.LoadData()
+tout.Info('Writing data to %s' % entry.GetPath())
+if not entry.WriteData(data, decomp):
+entry.Raise('Entry data size does not match, but resize is disabled')
+tout.Info('Processing image')
+ProcessImage(image, update_fdt=True, write_map=False, get_contents=False)
+tout.Info('WriteEntry done')
+
+
def ExtractEntries(image_fname, output_fname, outdir, entry_paths,
decomp=True):
"""Extract the data from one or more entries and write it to files
@@ -238,7 +264,7 @@ def PrepareImagesAndDtbs(dtb_fname, select_images,
update_fdt):
return images
-def ProcessImage(image, update_fdt, write_map):
+def ProcessImage(image, update_fdt, write_map, get_contents=True):
"""Perform all steps for this image, including checking and # writing it.
This means that errors found with a later image will be reported after
@@ -249,8 +275,11 @@ def ProcessImage(image, update_fdt, write_map):
image: Image to process
update_fdt: True to update the FDT wth entry offsets, etc.
write_map: True to write a map file
+get_contents: True to get the image contents from files, etc., False if
+the contents is already present
"""
-image.GetEntryContents()
+if get_contents:
+image.GetEntryContents()
image.GetEntryOffsets()
# We need to pack the entries to figure out where everything
diff --git a/tools/binman/entry.py b/tools/binman/entry.py
index ddf52d8e103..07d5838c1a2 100644
--- a/tools/binman/entry.py
+++ b/tools/binman/entry.py
@@ -698,6 +698,7 @@ features to produce new behaviours.
def LoadData(self, decomp=True):
data = self.ReadData(decomp)
+self.contents_size = len(data)
self.ProcessContentsUpdate(data)
self.Detail('Loaded data size %x' % len(data))
@@ -708,3 +709,25 @@ features to produce new behaviours.
[U-Boot] [PATCH 32/53] binman: Move Image.BuildImage() into a single function
Now that an Image is an Entry_section, there is no need for the separate
BuildSection() function. Drop it and add a bit of logging.
Signed-off-by: Simon Glass
---
tools/binman/image.py | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/tools/binman/image.py b/tools/binman/image.py
index 893e8cb4cd5..fd4f5044929 100644
--- a/tools/binman/image.py
+++ b/tools/binman/image.py
@@ -142,16 +142,14 @@ class Image(section.Entry_section):
"""Write symbol values into binary files for access at run time"""
section.Entry_section.WriteSymbols(self, self)
-def BuildSection(self, fd, base_offset):
-"""Write the section to a file"""
-fd.seek(base_offset)
-fd.write(self.GetData())
-
def BuildImage(self):
"""Write the image to a file"""
fname = tools.GetOutputFilename(self._filename)
+tout.Info("Writing image to '%s'" % fname)
with open(fname, 'wb') as fd:
-self.BuildSection(fd, 0)
+data = self.GetData()
+fd.write(data)
+tout.Info("Wrote %#x bytes" % len(data))
def WriteMap(self):
"""Write a map of the image to a .map file
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 30/53] binman: Update documentation for image creation
There are a few more steps in the process now. Update the documentation to reflect this. Signed-off-by: Simon Glass --- tools/binman/README | 23 ++- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/tools/binman/README b/tools/binman/README index 6a1cd110a4c..1f9e13784fc 100644 --- a/tools/binman/README +++ b/tools/binman/README @@ -679,22 +679,35 @@ large enough to hold all the entries. 7. CheckEntries() - checks that the entries do not overlap, nor extend outside the image. -8. SetCalculatedProperties() - update any calculated properties in the device +8. SetImagePos() - sets the image position of every entry. This is the absolute +position 'image-pos', as opposed to 'offset' which is relative to the containing +section. This must be done after all offsets are known, which is why it is quite +late in the ordering. + +9. SetCalculatedProperties() - update any calculated properties in the device tree. This sets the correct 'offset' and 'size' vaues, for example. -9. ProcessEntryContents() - this calls Entry.ProcessContents() on each entry. +10. ProcessEntryContents() - this calls Entry.ProcessContents() on each entry. The default implementatoin does nothing. This can be overriden to adjust the contents of an entry in some way. For example, it would be possible to create an entry containing a hash of the contents of some other entries. At this stage the offset and size of entries should not be adjusted unless absolutely necessary, since it requires a repack (going back to PackEntries()). -10. WriteSymbols() - write the value of symbols into the U-Boot SPL binary. +11. ResetForPack() - if the ProcessEntryContents() step failed, in that an entry +has changed its size, then there is no alternative but to go back to step 5 and +try again, repacking the entries with the updated size. ResetForPack() removes +the fixed offset/size values added by binman, so that the packing can start from +scratch. + +12. WriteSymbols() - write the value of symbols into the U-Boot SPL binary. See 'Access to binman entry offsets at run time' below for a description of what happens in this stage. -11. BuildImage() - builds the image and writes it to a file. This is the final -step. +13. BuildImage() - builds the image and writes it to a file + +14. WriteMap() - writes a text file containing a map of the image. This is the +final step. Automatic .dtsi inclusion -- 2.22.0.657.g960e92d24f-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 36/53] binman: Support shrinking a entry after packing
Sometimes an entry may shrink after it has already been packed. In that
case we must repack the items. Of course it is always possible to just
leave the entry at its original size and waste space at the end. This is
what binman does by default, since there is the possibility of the entry
changing size every time binman calculates its contents, thus causing a
loop.
Signed-off-by: Simon Glass
---
tools/binman/control.py| 2 +-
tools/binman/entry.py | 28 +-
tools/binman/ftest.py | 25 ++-
tools/binman/state.py | 27 +
tools/binman/test/140_entry_shrink.dts | 20 ++
5 files changed, 91 insertions(+), 11 deletions(-)
create mode 100644 tools/binman/test/140_entry_shrink.dts
diff --git a/tools/binman/control.py b/tools/binman/control.py
index c3f358d45c4..22e3e306e54 100644
--- a/tools/binman/control.py
+++ b/tools/binman/control.py
@@ -333,7 +333,7 @@ def ProcessImage(image, update_fdt, write_map,
get_contents=True,
break
image.ResetForPack()
if not sizes_ok:
-image.Raise('Entries expanded after packing (tried %s passes)' %
+image.Raise('Entries changed size after packing (tried %s passes)' %
passes)
image.WriteSymbols()
diff --git a/tools/binman/entry.py b/tools/binman/entry.py
index 8dacc61f5a1..90192c11b77 100644
--- a/tools/binman/entry.py
+++ b/tools/binman/entry.py
@@ -285,16 +285,26 @@ class Entry(object):
"""
size_ok = True
new_size = len(data)
-if state.AllowEntryExpansion():
+if state.AllowEntryExpansion() and new_size > self.contents_size:
+# self.data will indicate the new size needed
+size_ok = False
+elif state.AllowEntryContraction() and new_size < self.contents_size:
+size_ok = False
+
+# If not allowed to change, try to deal with it or give up
+if size_ok:
if new_size > self.contents_size:
-tout.Debug("Entry '%s' size change from %s to %s" % (
-self._node.path, ToHex(self.contents_size),
-ToHex(new_size)))
-# self.data will indicate the new size needed
-size_ok = False
-elif new_size != self.contents_size:
-self.Raise('Cannot update entry size from %d to %d' %
- (self.contents_size, new_size))
+self.Raise('Cannot update entry size from %d to %d' %
+(self.contents_size, new_size))
+
+# Don't let the data shrink. Pad it if necessary
+if size_ok and new_size < self.contents_size:
+data += tools.GetBytes(0, self.contents_size - new_size)
+
+if not size_ok:
+tout.Debug("Entry '%s' size change from %s to %s" % (
+self._node.path, ToHex(self.contents_size),
+ToHex(new_size)))
self.SetContents(data)
return size_ok
diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index f8568d7cda1..11155ced709 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -2143,7 +2143,7 @@ class TestFunctional(unittest.TestCase):
"""Test expanding an entry after it is packed, twice"""
with self.assertRaises(ValueError) as e:
self._DoReadFile('122_entry_expand_twice.dts')
-self.assertIn("Image '/binman': Entries expanded after packing",
+self.assertIn("Image '/binman': Entries changed size after packing",
str(e.exception))
def testEntryExpandSection(self):
@@ -2952,6 +2952,29 @@ class TestFunctional(unittest.TestCase):
self.assertIn('Entry data size does not match, but allow-repack is not
present for this image',
str(e.exception))
+def testEntryShrink(self):
+"""Test contracting an entry after it is packed"""
+try:
+state.SetAllowEntryContraction(True)
+data = self._DoReadFileDtb('140_entry_shrink.dts',
+ update_dtb=True)[0]
+finally:
+state.SetAllowEntryContraction(False)
+self.assertEqual(b'a', data[:1])
+self.assertEqual(U_BOOT_DATA, data[1:1 + len(U_BOOT_DATA)])
+self.assertEqual(b'a', data[-1:])
+
+def testEntryShrinkFail(self):
+"""Test not being allowed to contract an entry after it is packed"""
+data = self._DoReadFileDtb('140_entry_shrink.dts', update_dtb=True)[0]
+
+# In this case there is a spare byte at the end of the data. The size
of
+# the contents is only 1 byte but we still have the size before it
+# shrunk.
+self.assertEqual(b'a\0', data[:2])
+self.assertEqual(U_BOOT_DATA, data[2:2 + len(U_BOOT_DATA)])
+self.assertEqual(b'a\0', data[-2:])
+
if __name__ == "__main__":
[U-Boot] [PATCH 34/53] binman: Allow updating entries that change size
So far we don't allow entries to change size when repacking. But this is
not very useful since it is common for entries to change size after an
updated binary is built, etc.
Add support for this, respecting the original offset/size/alignment
constraints of the image layout. For this to work the original image
must have been created with the 'allow-repack' property.
This does not support entry types with sub-entries such as files and
CBFS, but it does support sections.
Signed-off-by: Simon Glass
---
tools/binman/README | 4 +-
tools/binman/control.py | 29 --
tools/binman/etype/fdtmap.py | 9 ++--
tools/binman/ftest.py| 69 +++-
tools/binman/image.py| 3 +-
tools/binman/state.py| 3 +-
tools/binman/test/139_replace_repack.dts | 22
7 files changed, 113 insertions(+), 26 deletions(-)
create mode 100644 tools/binman/test/139_replace_repack.dts
diff --git a/tools/binman/README b/tools/binman/README
index 1f9e13784fc..af2a2314719 100644
--- a/tools/binman/README
+++ b/tools/binman/README
@@ -589,7 +589,9 @@ that there is an 'fdtmap' entry in the image. For example:
$ binman replace -i image.bin section/cbfs/u-boot
which will write the contents of the file 'u-boot' from the current directory
-to the that entry. The file must be the same size as the entry being replaced.
+to the that entry. If the entry size changes, you must add the 'allow-repack'
+property to the original image before generating it (see above), otherwise you
+will get an error.
Logging
diff --git a/tools/binman/control.py b/tools/binman/control.py
index f9680e3948d..c3f358d45c4 100644
--- a/tools/binman/control.py
+++ b/tools/binman/control.py
@@ -118,11 +118,11 @@ def ReadEntry(image_fname, entry_path, decomp=True):
return entry.ReadData(decomp)
-def WriteEntry(image_fname, entry_path, data, decomp=True):
+def WriteEntry(image_fname, entry_path, data, decomp=True, allow_resize=True):
"""Replace an entry in an image
This replaces the data in a particular entry in an image. This size of the
-new data must match the size of the old data
+new data must match the size of the old data unless allow_resize is True.
Args:
image_fname: Image filename to process
@@ -130,18 +130,33 @@ def WriteEntry(image_fname, entry_path, data,
decomp=True):
data: Data to replace with
decomp: True to compress the data if needed, False if data is
already compressed so should be used as is
+allow_resize: True to allow entries to change size (this does a re-pack
+of the entries), False to raise an exception
+
+Returns:
+Image object that was updated
"""
tout.Info("WriteEntry '%s', file '%s'" % (entry_path, image_fname))
image = Image.FromFile(image_fname)
entry = image.FindEntryPath(entry_path)
state.PrepareFromLoadedData(image)
image.LoadData()
+
+# If repacking, drop the old offset/size values except for the original
+# ones, so we are only left with the constraints.
+if allow_resize:
+image.ResetForPack()
tout.Info('Writing data to %s' % entry.GetPath())
if not entry.WriteData(data, decomp):
-entry.Raise('Entry data size does not match, but resize is disabled')
+if not image.allow_repack:
+entry.Raise('Entry data size does not match, but allow-repack is
not present for this image')
+if not allow_resize:
+entry.Raise('Entry data size does not match, but resize is
disabled')
tout.Info('Processing image')
-ProcessImage(image, update_fdt=True, write_map=False, get_contents=False)
+ProcessImage(image, update_fdt=True, write_map=False, get_contents=False,
+ allow_resize=allow_resize)
tout.Info('WriteEntry done')
+return image
def ExtractEntries(image_fname, output_fname, outdir, entry_paths,
@@ -264,7 +279,8 @@ def PrepareImagesAndDtbs(dtb_fname, select_images,
update_fdt):
return images
-def ProcessImage(image, update_fdt, write_map, get_contents=True):
+def ProcessImage(image, update_fdt, write_map, get_contents=True,
+ allow_resize=True):
"""Perform all steps for this image, including checking and # writing it.
This means that errors found with a later image will be reported after
@@ -277,6 +293,8 @@ def ProcessImage(image, update_fdt, write_map,
get_contents=True):
write_map: True to write a map file
get_contents: True to get the image contents from files, etc., False if
the contents is already present
+allow_resize: True to allow entries to change size (this does a re-pack
+of the entries), False to raise an exception
"""
if get_contents:
image.GetEntryContents()
@@ -309,6 +327,7 @@ def ProcessImage(image, update_fdt, write_map,
[U-Boot] [PATCH 40/53] binman: Add a few more features to the wishlist
Add mention of a few other desirable features that may be implemented in the future. Signed-off-by: Simon Glass --- tools/binman/README | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/binman/README b/tools/binman/README index af2a2314719..5e8f9fd4808 100644 --- a/tools/binman/README +++ b/tools/binman/README @@ -962,6 +962,8 @@ Some ideas: - Support updating binaries in an image (with repacking) - Support adding FITs to an image - Support for ARM Trusted Firmware (ATF) +- Detect invalid properties in nodes +- Sort the fdtmap by offset -- Simon Glass -- 2.22.0.657.g960e92d24f-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 45/53] patman: Reset the output directory when it is removed
At present outdir remains set ever after the output directory has been removed. Fix this to avoid trying to access it when it is not present. Signed-off-by: Simon Glass --- tools/patman/tools.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/patman/tools.py b/tools/patman/tools.py index d615227482a..0d4705db760 100644 --- a/tools/patman/tools.py +++ b/tools/patman/tools.py @@ -83,6 +83,7 @@ def FinaliseOutputDir(): """Tidy up: delete output directory if temporary and not preserved.""" if outdir and not preserve_outdir: _RemoveOutputDir() +outdir = None def GetOutputFilename(fname): """Return a filename within the output directory. @@ -101,6 +102,7 @@ def _FinaliseForTest(): if outdir: _RemoveOutputDir() +outdir = None def SetInputDirs(dirname): """Add a list of input directories, where input files are kept. -- 2.22.0.657.g960e92d24f-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 21/53] binman: Store the entry in output_fdt_files
In some cases we want to access the Entry object for a particular device
tree. This allows us to read its contents or update it. Add this
information to output_fdt_files and provide a function to read it.
Also rename output_fdt_files since its name is no-longer descriptive.
Signed-off-by: Simon Glass
---
tools/binman/state.py | 49 ++-
1 file changed, 34 insertions(+), 15 deletions(-)
diff --git a/tools/binman/state.py b/tools/binman/state.py
index 87674100665..34907d9d43c 100644
--- a/tools/binman/state.py
+++ b/tools/binman/state.py
@@ -19,7 +19,8 @@ import tools
# value: tuple:
# Fdt object
# Filename
-output_fdt_files = {}
+# Entry object, or None if not known
+output_fdt_info = {}
# Arguments passed to binman to provide arguments to entries
entry_args = {}
@@ -49,11 +50,29 @@ def GetFdtForEtype(etype):
Returns:
Fdt object associated with the entry type
"""
-value = output_fdt_files.get(etype);
+value = output_fdt_info.get(etype);
if not value:
return None
return value[0]
+def GetEntryForEtype(etype):
+"""Get the Entry for a particular device-tree filename
+
+Binman keeps track of at least one device-tree file called u-boot.dtb but
+can also have others (e.g. for SPL). This function looks up the given
+filename and returns the associated Fdt object.
+
+Args:
+etype: Entry type of device tree (e.g. 'u-boot-dtb')
+
+Returns:
+Entry object associated with the entry type, if present in the image
+"""
+value = output_fdt_info.get(etype);
+if not value:
+return None
+return value[2]
+
def GetFdtPath(etype):
"""Get the full pathname of a particular Fdt object
@@ -66,7 +85,7 @@ def GetFdtPath(etype):
Returns:
Full path name to the associated Fdt
"""
-return output_fdt_files[etype][0]._fname
+return output_fdt_info[etype][0]._fname
def GetFdtContents(etype='u-boot-dtb'):
"""Looks up the FDT pathname and contents
@@ -83,13 +102,13 @@ def GetFdtContents(etype='u-boot-dtb'):
pathname to Fdt
Fdt data (as bytes)
"""
-if etype not in output_fdt_files:
+if etype not in output_fdt_info:
return None, None
if not use_fake_dtb:
pathname = GetFdtPath(etype)
data = GetFdtForEtype(etype).GetContents()
else:
-fname = output_fdt_files[etype][1]
+fname = output_fdt_info[etype][1]
pathname = tools.GetInputFilename(fname)
data = tools.ReadFile(pathname)
return pathname, data
@@ -134,7 +153,7 @@ def Prepare(images, dtb):
images: List of images being used
dtb: Main dtb
"""
-global output_fdt_files, main_dtb
+global output_fdt_info, main_dtb
# Import these here in case libfdt.py is not available, in which case
# the above help option still works.
import fdt
@@ -145,23 +164,23 @@ def Prepare(images, dtb):
# since it is assumed to be the one passed in with options.dt, and
# was handled just above.
main_dtb = dtb
-output_fdt_files.clear()
-output_fdt_files['u-boot-dtb'] = [dtb, 'u-boot.dtb']
-output_fdt_files['u-boot-spl-dtb'] = [dtb, 'spl/u-boot-spl.dtb']
-output_fdt_files['u-boot-tpl-dtb'] = [dtb, 'tpl/u-boot-tpl.dtb']
+output_fdt_info.clear()
+output_fdt_info['u-boot-dtb'] = [dtb, 'u-boot.dtb', None]
+output_fdt_info['u-boot-spl-dtb'] = [dtb, 'spl/u-boot-spl.dtb', None]
+output_fdt_info['u-boot-tpl-dtb'] = [dtb, 'tpl/u-boot-tpl.dtb', None]
if not use_fake_dtb:
fdt_set = {}
for image in images.values():
fdt_set.update(image.GetFdts())
for etype, other in fdt_set.items():
-_, other_fname = other
+entry, other_fname = other
infile = tools.GetInputFilename(other_fname)
other_fname_dtb = fdt_util.EnsureCompiled(infile)
out_fname = tools.GetOutputFilename('%s.out' %
os.path.split(other_fname)[1])
tools.WriteFile(out_fname, tools.ReadFile(other_fname_dtb))
other_dtb = fdt.FdtScan(out_fname)
-output_fdt_files[etype] = [other_dtb, other_fname]
+output_fdt_info[etype] = [other_dtb, out_fname, entry]
def GetAllFdts():
"""Yield all device tree files being used by binman
@@ -170,8 +189,8 @@ def GetAllFdts():
Device trees being used (U-Boot proper, SPL, TPL)
"""
yield main_dtb
-for etype in output_fdt_files:
-dtb = output_fdt_files[etype][0]
+for etype in output_fdt_info:
+dtb = output_fdt_info[etype][0]
if dtb != main_dtb:
yield dtb
@@ -190,7 +209,7 @@ def GetUpdateNodes(node):
is node, SPL and TPL)
"""
yield node
-for dtb, fname in output_fdt_files.values():
+for dtb, fname, _ in output_fdt_info.values():
if dtb !=
[U-Boot] [PATCH 04/53] binman: Use print() to print output
At present tout writes directly to stdout. This is not necessary and it prevents tests from redirecting output. Change it to use print() for the non-progress output. Signed-off-by: Simon Glass --- tools/patman/tout.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/patman/tout.py b/tools/patman/tout.py index 15acce28cb9..ae04c30f1db 100644 --- a/tools/patman/tout.py +++ b/tools/patman/tout.py @@ -4,6 +4,8 @@ # Terminal output logging. # +from __future__ import print_function + import sys import terminal @@ -87,7 +89,7 @@ def _Output(level, msg, color=None): ClearProgress() if color: msg = _color.Color(color, msg) -_stdout.write(msg + '\n') +print(msg) def DoOutput(level, msg): """Output a message to the terminal. -- 2.22.0.657.g960e92d24f-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 38/53] binman: Adjust fmap to ignore CBFS files
The FMAP is not intended to show the files inside a CBFS. The FMAP can be
used to locate the CBFS itself, but then the CBFS must be read to find out
what is in it.
Update the FMAP to work this way and add some debugging while we are here.
Signed-off-by: Simon Glass
---
tools/binman/README.entries | 3 ++-
tools/binman/etype/fmap.py | 9 +++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/tools/binman/README.entries b/tools/binman/README.entries
index 37b8b4c4f98..0f0e367d026 100644
--- a/tools/binman/README.entries
+++ b/tools/binman/README.entries
@@ -314,7 +314,8 @@ see www.flashrom.org/Flashrom for more information.
When used, this entry will be populated with an FMAP which reflects the
entries in the current image. Note that any hierarchy is squashed, since
-FMAP does not support this.
+FMAP does not support this. Also, CBFS entries appear as a single entry -
+the sub-entries are ignored.
diff --git a/tools/binman/etype/fmap.py b/tools/binman/etype/fmap.py
index 56677cbac1c..835ba5012e5 100644
--- a/tools/binman/etype/fmap.py
+++ b/tools/binman/etype/fmap.py
@@ -8,6 +8,8 @@
from entry import Entry
import fmap_util
import tools
+from tools import ToHexSize
+import tout
class Entry_fmap(Entry):
@@ -26,7 +28,8 @@ class Entry_fmap(Entry):
When used, this entry will be populated with an FMAP which reflects the
entries in the current image. Note that any hierarchy is squashed, since
-FMAP does not support this.
+FMAP does not support this. Also, CBFS entries appear as a single entry -
+the sub-entries are ignored.
"""
def __init__(self, section, etype, node):
Entry.__init__(self, section, etype, node)
@@ -39,7 +42,9 @@ class Entry_fmap(Entry):
"""
def _AddEntries(areas, entry):
entries = entry.GetEntries()
-if entries:
+tout.Debug("fmap: Add entry '%s' type '%s' (%s subentries)" %
+ (entry.GetPath(), entry.etype, ToHexSize(entries)))
+if entries and entry.etype != 'cbfs':
for subentry in entries.values():
_AddEntries(areas, subentry)
else:
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 35/53] binman: Update the _testing entry to support shrinkage
Sometimes entries shrink after packing. As a start towards supporting
this, update the _testing entry to handle the test case.
Signed-off-by: Simon Glass
---
tools/binman/etype/_testing.py | 25 +++--
tools/binman/ftest.py | 16
2 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/tools/binman/etype/_testing.py b/tools/binman/etype/_testing.py
index 4a2e4eb7caf..25a6206bf33 100644
--- a/tools/binman/etype/_testing.py
+++ b/tools/binman/etype/_testing.py
@@ -31,8 +31,8 @@ class Entry__testing(Entry):
return-invalid-entry: Return an invalid entry from GetOffsets()
return-unknown-contents: Refuse to provide any contents (to cause a
failure)
-bad-update-contents: Implement ProcessContents() incorrectly so as to
-cause a failure
+bad-update-contents: Return a larger size in ProcessContents
+bad-shrink-contents: Return a larger size in ProcessContents
never-complete-process-fdt: Refund to process the FDT (to cause a
failure)
require-args: Require that all used args are present (generating an
@@ -51,6 +51,8 @@ class Entry__testing(Entry):
'return-unknown-contents')
self.bad_update_contents = fdt_util.GetBool(self._node,
'bad-update-contents')
+self.bad_shrink_contents = fdt_util.GetBool(self._node,
+'bad-shrink-contents')
self.return_contents_once = fdt_util.GetBool(self._node,
'return-contents-once')
self.bad_update_contents_twice = fdt_util.GetBool(self._node,
@@ -76,7 +78,7 @@ class Entry__testing(Entry):
if self.force_bad_datatype:
self.GetEntryArgsOrProps([EntryArg('test-bad-datatype-arg', bool)])
self.return_contents = True
-self.contents = b'a'
+self.contents = b'aa'
def ObtainContents(self):
if self.return_unknown_contents or not self.return_contents:
@@ -93,14 +95,25 @@ class Entry__testing(Entry):
return {}
def ProcessContents(self):
+data = self.contents
if self.bad_update_contents:
# Request to update the contents with something larger, to cause a
# failure.
if self.bad_update_contents_twice:
-self.contents += b'a'
+data = self.data + b'a'
else:
-self.contents = b'aa'
-return self.ProcessContentsUpdate(self.contents)
+data = b'aaa'
+return self.ProcessContentsUpdate(data)
+if self.bad_shrink_contents:
+# Request to update the contents with something smaller, to cause a
+# failure.
+data = b'a'
+return self.ProcessContentsUpdate(data)
+if self.bad_shrink_contents:
+# Request to update the contents with something smaller, to cause a
+# failure.
+data = b'a'
+return self.ProcessContentsUpdate(data)
return True
def ProcessFdt(self, fdt):
diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index 64c6c0abae1..f8568d7cda1 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -1236,7 +1236,7 @@ class TestFunctional(unittest.TestCase):
state.SetAllowEntryExpansion(False)
with self.assertRaises(ValueError) as e:
self._DoReadFile('059_change_size.dts', True)
-self.assertIn("Node '/binman/_testing': Cannot update entry size
from 1 to 2",
+self.assertIn("Node '/binman/_testing': Cannot update entry size
from 2 to 3",
str(e.exception))
finally:
state.SetAllowEntryExpansion(True)
@@ -1252,7 +1252,7 @@ class TestFunctional(unittest.TestCase):
'image-pos': 0,
'offset': 0,
'_testing:offset': 32,
-'_testing:size': 1,
+'_testing:size': 2,
'_testing:image-pos': 32,
'section@0/u-boot:offset': 0,
'section@0/u-boot:size': len(U_BOOT_DATA),
@@ -2135,9 +2135,9 @@ class TestFunctional(unittest.TestCase):
def testEntryExpand(self):
"""Test expanding an entry after it is packed"""
data = self._DoReadFile('121_entry_expand.dts')
-self.assertEqual(b'aa', data[:2])
-self.assertEqual(U_BOOT_DATA, data[2:2 + len(U_BOOT_DATA)])
-self.assertEqual(b'aa', data[-2:])
+self.assertEqual(b'aaa', data[:3])
+self.assertEqual(U_BOOT_DATA, data[3:3 + len(U_BOOT_DATA)])
+self.assertEqual(b'aaa', data[-3:])
def testEntryExpandBad(self):
"""Test expanding an entry after it is packed, twice"""
@@ -2149,9 +2149,9 @@ class TestFunctional(unittest.TestCase):
def
[U-Boot] [PATCH 25/53] binman: Add a constant for common entry properties
We use this same combination of properties several times in tests. Add a
constant for it to avoid typos, etc.
Signed-off-by: Simon Glass
---
tools/binman/ftest.py | 15 ---
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index 08a1df03077..bb886266277 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -69,8 +69,12 @@ FILES_DATA= (b"sorry I'm late\nOh, don't bother
apologising, I'm " +
COMPRESS_DATA = b'compress xx data'
REFCODE_DATA = b'refcode'
+# The expected size for the device tree in some tests
EXTRACT_DTB_SIZE = 0x3c9
+# Properties expected to be in the device tree when update_dtb is used
+BASE_DTB_PROPS = ['offset', 'size', 'image-pos']
+
class TestFunctional(unittest.TestCase):
"""Functional tests for binman
@@ -1240,7 +1244,7 @@ class TestFunctional(unittest.TestCase):
update_dtb=True)
dtb = fdt.Fdt(out_dtb_fname)
dtb.Scan()
-props = self._GetPropTree(dtb, ['offset', 'size', 'image-pos'])
+props = self._GetPropTree(dtb, BASE_DTB_PROPS)
self.assertEqual({
'image-pos': 0,
'offset': 0,
@@ -1583,8 +1587,7 @@ class TestFunctional(unittest.TestCase):
for item in ['', 'spl', 'tpl']:
dtb = fdt.Fdt.FromData(data[start:])
dtb.Scan()
-props = self._GetPropTree(dtb, ['offset', 'size', 'image-pos',
-'spl', 'tpl'])
+props = self._GetPropTree(dtb, BASE_DTB_PROPS + ['spl', 'tpl'])
expected = dict(base_expected)
if item:
expected[item] = 0
@@ -2052,8 +2055,7 @@ class TestFunctional(unittest.TestCase):
fdt_data = fdtmap_data[16:]
dtb = fdt.Fdt.FromData(fdt_data)
dtb.Scan()
-props = self._GetPropTree(dtb, ['offset', 'size', 'image-pos'],
- prefix='/')
+props = self._GetPropTree(dtb, BASE_DTB_PROPS, prefix='/')
self.assertEqual({
'image-pos': 0,
'offset': 0,
@@ -2172,8 +2174,7 @@ class TestFunctional(unittest.TestCase):
update_dtb=True)
dtb = fdt.Fdt(out_dtb_fname)
dtb.Scan()
-props = self._GetPropTree(dtb, ['offset', 'size', 'image-pos',
-'uncomp-size'])
+props = self._GetPropTree(dtb, BASE_DTB_PROPS + ['uncomp-size'])
del props['cbfs/u-boot:size']
self.assertEqual({
'offset': 0,
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 13/53] patman: Update tout to avoid open-coding the debug levels
Use the debug level constants instead of open-coding them in the file. Signed-off-by: Simon Glass --- tools/patman/tout.py | 18 +++--- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/tools/patman/tout.py b/tools/patman/tout.py index ae04c30f1db..2a384851b0d 100644 --- a/tools/patman/tout.py +++ b/tools/patman/tout.py @@ -11,11 +11,7 @@ import sys import terminal # Output verbosity levels that we support -ERROR = 0 -WARNING = 1 -NOTICE = 2 -INFO = 3 -DEBUG = 4 +ERROR, WARNING, NOTICE, INFO, DETAIL, DEBUG = range(6) in_progress = False @@ -107,7 +103,7 @@ def Error(msg): Args: msg; Message to display. """ -_Output(0, msg, _color.RED) +_Output(ERROR, msg, _color.RED) def Warning(msg): """Display a warning message @@ -115,7 +111,7 @@ def Warning(msg): Args: msg; Message to display. """ -_Output(1, msg, _color.YELLOW) +_Output(WARNING, msg, _color.YELLOW) def Notice(msg): """Display an important infomation message @@ -123,7 +119,7 @@ def Notice(msg): Args: msg; Message to display. """ -_Output(2, msg) +_Output(NOTICE, msg) def Info(msg): """Display an infomation message @@ -131,7 +127,7 @@ def Info(msg): Args: msg; Message to display. """ -_Output(3, msg) +_Output(INFO, msg) def Detail(msg): """Display a detailed message @@ -139,7 +135,7 @@ def Detail(msg): Args: msg; Message to display. """ -_Output(4, msg) +_Output(DETAIL, msg) def Debug(msg): """Display a debug message @@ -147,7 +143,7 @@ def Debug(msg): Args: msg; Message to display. """ -_Output(5, msg) +_Output(DEBUG, msg) def UserOutput(msg): """Display a message regardless of the current output level. -- 2.22.0.657.g960e92d24f-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 49/53] binman: Move control.WriteEntry further down the file
Move this function after the extraction logic so we can keep the writing
logic in one place.
Signed-off-by: Simon Glass
---
tools/binman/control.py | 81 -
1 file changed, 40 insertions(+), 41 deletions(-)
diff --git a/tools/binman/control.py b/tools/binman/control.py
index 9c8bc6253fc..23a3d558612 100644
--- a/tools/binman/control.py
+++ b/tools/binman/control.py
@@ -118,47 +118,6 @@ def ReadEntry(image_fname, entry_path, decomp=True):
return entry.ReadData(decomp)
-def WriteEntry(image_fname, entry_path, data, decomp=True, allow_resize=True):
-"""Replace an entry in an image
-
-This replaces the data in a particular entry in an image. This size of the
-new data must match the size of the old data unless allow_resize is True.
-
-Args:
-image_fname: Image filename to process
-entry_path: Path to entry to extract
-data: Data to replace with
-decomp: True to compress the data if needed, False if data is
-already compressed so should be used as is
-allow_resize: True to allow entries to change size (this does a re-pack
-of the entries), False to raise an exception
-
-Returns:
-Image object that was updated
-"""
-tout.Info("WriteEntry '%s', file '%s'" % (entry_path, image_fname))
-image = Image.FromFile(image_fname)
-entry = image.FindEntryPath(entry_path)
-state.PrepareFromLoadedData(image)
-image.LoadData()
-
-# If repacking, drop the old offset/size values except for the original
-# ones, so we are only left with the constraints.
-if allow_resize:
-image.ResetForPack()
-tout.Info('Writing data to %s' % entry.GetPath())
-if not entry.WriteData(data, decomp):
-if not image.allow_repack:
-entry.Raise('Entry data size does not match, but allow-repack is
not present for this image')
-if not allow_resize:
-entry.Raise('Entry data size does not match, but resize is
disabled')
-tout.Info('Processing image')
-ProcessImage(image, update_fdt=True, write_map=False, get_contents=False,
- allow_resize=allow_resize)
-tout.Info('WriteEntry done')
-return image
-
-
def ExtractEntries(image_fname, output_fname, outdir, entry_paths,
decomp=True):
"""Extract the data from one or more entries and write it to files
@@ -210,6 +169,46 @@ def ExtractEntries(image_fname, output_fname, outdir,
entry_paths,
return einfos
+def WriteEntry(image_fname, entry_path, data, decomp=True, allow_resize=True):
+"""Replace an entry in an image
+
+This replaces the data in a particular entry in an image. This size of the
+new data must match the size of the old data unless allow_resize is True.
+
+Args:
+image_fname: Image filename to process
+entry_path: Path to entry to extract
+data: Data to replace with
+decomp: True to compress the data if needed, False if data is
+already compressed so should be used as is
+allow_resize: True to allow entries to change size (this does a re-pack
+of the entries), False to raise an exception
+
+Returns:
+Image object that was updated
+"""
+tout.Info("WriteEntry '%s', file '%s'" % (entry_path, image_fname))
+image = Image.FromFile(image_fname)
+entry = image.FindEntryPath(entry_path)
+state.PrepareFromLoadedData(image)
+image.LoadData()
+
+# If repacking, drop the old offset/size values except for the original
+# ones, so we are only left with the constraints.
+if allow_resize:
+image.ResetForPack()
+tout.Info('Writing data to %s' % entry.GetPath())
+if not entry.WriteData(data, decomp):
+if not image.allow_repack:
+entry.Raise('Entry data size does not match, but allow-repack is
not present for this image')
+if not allow_resize:
+entry.Raise('Entry data size does not match, but resize is
disabled')
+tout.Info('Processing image')
+ProcessImage(image, update_fdt=True, write_map=False, get_contents=False,
+ allow_resize=allow_resize)
+tout.Info('WriteEntry done')
+return image
+
def PrepareImagesAndDtbs(dtb_fname, select_images, update_fdt):
"""Prepare the images to be processed and select the device tree
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 47/53] binman: Add a test function to clean up the output dir
Put tearDown()'s logic into a new _CleanupOutputDir() function so that it
can be called from elsewhere.
Signed-off-by: Simon Glass
---
tools/binman/ftest.py | 12
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index 12e32a0b5de..a490d394d86 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -187,6 +187,13 @@ class TestFunctional(unittest.TestCase):
if not self.have_lz4:
self.skipTest('lz4 --no-frame-crc not available')
+def _CleanupOutputDir(self):
+"""Remove the temporary output directory"""
+if self.preserve_outdirs:
+print('Preserving output dir: %s' % tools.outdir)
+else:
+tools._FinaliseForTest()
+
def setUp(self):
# Enable this to turn on debugging output
# tout.Init(tout.DEBUG)
@@ -194,10 +201,7 @@ class TestFunctional(unittest.TestCase):
def tearDown(self):
"""Remove the temporary output directory"""
-if self.preserve_outdirs:
-print('Preserving output dir: %s' % tools.outdir)
-else:
-tools._FinaliseForTest()
+self._CleanupOutputDir()
@classmethod
def _ResetDtbs(self):
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 27/53] binman: Tidy up _SetupDtb() to use its own temporary file
At present EnsureCompiled() uses an file from the 'output' directory (in
the tools module) when compiling the device tree. This is fine in most
cases, allowing useful inspection of the output files from binman.
However in functional tests, _SetupDtb() creates an output directory and
immediately removes it afterwards. This serves no benefit and just
confuses things, since the 'official' output directory is supposed to be
created and destroyed in control.Binman().
Add a new parameter for the optional temporary directory to use, and use a
separate temporary directory in _SetupDtb().
Signed-off-by: Simon Glass
---
tools/binman/ftest.py | 6 +++---
tools/dtoc/fdt_util.py | 12 +---
tools/dtoc/test_fdt.py | 17 -
3 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index bb886266277..47153285922 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -287,12 +287,12 @@ class TestFunctional(unittest.TestCase):
Returns:
Contents of device-tree binary
"""
-tools.PrepareOutputDir(None)
-dtb = fdt_util.EnsureCompiled(self.TestFile(fname))
+tmpdir = tempfile.mkdtemp(prefix='binmant.')
+dtb = fdt_util.EnsureCompiled(self.TestFile(fname), tmpdir)
with open(dtb, 'rb') as fd:
data = fd.read()
TestFunctional._MakeInputFile(outfile, data)
-tools.FinaliseOutputDir()
+shutil.rmtree(tmpdir)
return data
def _GetDtbContentsForSplTpl(self, dtb_data, name):
diff --git a/tools/dtoc/fdt_util.py b/tools/dtoc/fdt_util.py
index f47879ac006..b105faec749 100644
--- a/tools/dtoc/fdt_util.py
+++ b/tools/dtoc/fdt_util.py
@@ -43,12 +43,14 @@ def fdt_cells_to_cpu(val, cells):
out = out << 32 | fdt32_to_cpu(val[1])
return out
-def EnsureCompiled(fname, capture_stderr=False):
+def EnsureCompiled(fname, tmpdir=None, capture_stderr=False):
"""Compile an fdt .dts source file into a .dtb binary blob if needed.
Args:
fname: Filename (if .dts it will be compiled). It not it will be
left alone
+tmpdir: Temporary directory for output files, or None to use the
+tools-module output directory
Returns:
Filename of resulting .dtb file
@@ -57,8 +59,12 @@ def EnsureCompiled(fname, capture_stderr=False):
if ext != '.dts':
return fname
-dts_input = tools.GetOutputFilename('source.dts')
-dtb_output = tools.GetOutputFilename('source.dtb')
+if tmpdir:
+dts_input = os.path.join(tmpdir, 'source.dts')
+dtb_output = os.path.join(tmpdir, 'source.dtb')
+else:
+dts_input = tools.GetOutputFilename('source.dts')
+dtb_output = tools.GetOutputFilename('source.dtb')
search_paths = [os.path.join(os.getcwd(), 'include')]
root, _ = os.path.splitext(fname)
diff --git a/tools/dtoc/test_fdt.py b/tools/dtoc/test_fdt.py
index ed2d982a8fc..16a4430892e 100755
--- a/tools/dtoc/test_fdt.py
+++ b/tools/dtoc/test_fdt.py
@@ -9,7 +9,9 @@ from __future__ import print_function
from optparse import OptionParser
import glob
import os
+import shutil
import sys
+import tempfile
import unittest
# Bring in the patman libraries
@@ -540,10 +542,23 @@ class TestFdtUtil(unittest.TestCase):
self.assertEqual(0x12345678, fdt_util.fdt_cells_to_cpu(val, 1))
def testEnsureCompiled(self):
-"""Test a degenerate case of this function"""
+"""Test a degenerate case of this function (file already compiled)"""
dtb = fdt_util.EnsureCompiled('tools/dtoc/dtoc_test_simple.dts')
self.assertEqual(dtb, fdt_util.EnsureCompiled(dtb))
+def testEnsureCompiledTmpdir(self):
+"""Test providing a temporary directory"""
+try:
+old_outdir = tools.outdir
+tools.outdir= None
+tmpdir = tempfile.mkdtemp(prefix='test_fdt.')
+dtb = fdt_util.EnsureCompiled('tools/dtoc/dtoc_test_simple.dts',
+ tmpdir)
+self.assertEqual(tmpdir, os.path.dirname(dtb))
+shutil.rmtree(tmpdir)
+finally:
+tools.outdir= old_outdir
+
def RunTestCoverage():
"""Run the tests and check that we get 100% coverage"""
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 46/53] binman: Update state when replacing device-tree entries
Since the state module holds references to all the device trees used by
binman, it must be updated when the device trees are updated. Add support
for this.
Signed-off-by: Simon Glass
---
tools/binman/etype/blob_dtb.py | 9 +
tools/binman/state.py | 16
tools/dtoc/fdt.py | 8
tools/dtoc/test_fdt.py | 5 +
4 files changed, 38 insertions(+)
diff --git a/tools/binman/etype/blob_dtb.py b/tools/binman/etype/blob_dtb.py
index a3b548eef20..5b559967d78 100644
--- a/tools/binman/etype/blob_dtb.py
+++ b/tools/binman/etype/blob_dtb.py
@@ -53,3 +53,12 @@ class Entry_blob_dtb(Entry_blob):
"""
fname = self.GetDefaultFilename()
return {self.GetFdtEtype(): [self, fname]}
+
+def WriteData(self, data, decomp=True):
+ok = Entry_blob.WriteData(self, data, decomp)
+
+# Update the state module, since it has the authoritative record of the
+# device trees used. If we don't do this, then state.GetFdtContents()
+# will still return the old contents
+state.UpdateFdtContents(self.GetFdtEtype(), data)
+return ok
diff --git a/tools/binman/state.py b/tools/binman/state.py
index f22cc82d870..d704ed2c7cd 100644
--- a/tools/binman/state.py
+++ b/tools/binman/state.py
@@ -108,6 +108,22 @@ def GetFdtContents(etype='u-boot-dtb'):
data = tools.ReadFile(pathname)
return pathname, data
+def UpdateFdtContents(etype, data):
+"""Update the contents of a particular device tree
+
+The device tree is updated and written back to its file. This affects what
+is returned from future called to GetFdtContents(), etc.
+
+Args:
+etype: Entry type (e.g. 'u-boot-dtb')
+data: Data to replace the DTB with
+"""
+dtb, fname, entry = output_fdt_info[etype]
+dtb_fname = dtb.GetFilename()
+tools.WriteFile(dtb_fname, data)
+dtb = fdt.FdtScan(dtb_fname)
+output_fdt_info[etype] = [dtb, fname, entry]
+
def SetEntryArgs(args):
"""Set the value of the entry args
diff --git a/tools/dtoc/fdt.py b/tools/dtoc/fdt.py
index cd7673c7da0..6770be79fbe 100644
--- a/tools/dtoc/fdt.py
+++ b/tools/dtoc/fdt.py
@@ -695,6 +695,14 @@ class Fdt:
node = Node(fdt, parent, offset, name, path)
return node
+def GetFilename(self):
+"""Get the filename of the device tree
+
+Returns:
+String filename
+"""
+return self._fname
+
def FdtScan(fname):
"""Returns a new Fdt object"""
dtb = Fdt(fname)
diff --git a/tools/dtoc/test_fdt.py b/tools/dtoc/test_fdt.py
index 16a4430892e..028c8cbaa80 100755
--- a/tools/dtoc/test_fdt.py
+++ b/tools/dtoc/test_fdt.py
@@ -449,6 +449,11 @@ class TestProp(unittest.TestCase):
self.assertIn("node '/spl-test': Missing property 'one'",
str(e.exception))
+def testGetFilename(self):
+"""Test the dtb filename can be provided"""
+self.assertEqual(tools.GetOutputFilename('source.dtb'),
+ self.dtb.GetFilename())
+
class TestFdtUtil(unittest.TestCase):
"""Tests for the fdt_util module
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 39/53] binman: Place Intel descriptor at image start
The Intel descriptor must always appear at the start of an (x86) image,
so it is supposed to position itself there always. However there is no
explicit test for this. Add one and fix a bug introduced by the recent
change to adjust Entry to read the node in a separate call.
Signed-off-by: Simon Glass
---
tools/binman/etype/intel_descriptor.py | 6 +-
tools/binman/ftest.py | 9 +
tools/binman/test/141_descriptor_offset.dts | 20
3 files changed, 34 insertions(+), 1 deletion(-)
create mode 100644 tools/binman/test/141_descriptor_offset.dts
diff --git a/tools/binman/etype/intel_descriptor.py
b/tools/binman/etype/intel_descriptor.py
index adea578080c..fb5e889ebff 100644
--- a/tools/binman/etype/intel_descriptor.py
+++ b/tools/binman/etype/intel_descriptor.py
@@ -47,8 +47,12 @@ class Entry_intel_descriptor(Entry_blob):
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
self._regions = []
+
+def Pack(self, offset):
+"""Put this entry at the start of the image"""
if self.offset is None:
-self.offset = self.section.GetStartOffset()
+offset = self.section.GetStartOffset()
+return Entry_blob.Pack(self, offset)
def GetOffsets(self):
offset = self.data.find(FD_SIGNATURE)
diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index 11155ced709..d1ecd65c2c3 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -2975,6 +2975,15 @@ class TestFunctional(unittest.TestCase):
self.assertEqual(U_BOOT_DATA, data[2:2 + len(U_BOOT_DATA)])
self.assertEqual(b'a\0', data[-2:])
+def testDescriptorOffset(self):
+"""Test that the Intel descriptor is always placed at at the start"""
+data = self._DoReadFileDtb('141_descriptor_offset.dts')
+image = control.images['image']
+entries = image.GetEntries()
+desc = entries['intel-descriptor']
+self.assertEqual(0xff80, desc.offset);
+self.assertEqual(0xff80, desc.image_pos);
+
if __name__ == "__main__":
unittest.main()
diff --git a/tools/binman/test/141_descriptor_offset.dts
b/tools/binman/test/141_descriptor_offset.dts
new file mode 100644
index 000..f9bff016aa8
--- /dev/null
+++ b/tools/binman/test/141_descriptor_offset.dts
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/dts-v1/;
+
+/ {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ binman {
+ sort-by-offset;
+ end-at-4gb;
+ size = <0x80>;
+ u-boot {
+ offset = <0x>;
+ };
+ intel-descriptor {
+ filename = "descriptor.bin";
+ };
+ };
+};
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 24/53] binman: Add a function to obtain the image for an Entry
At present we have an 'image' property in the entry for this purpose, but
this is not necessary and seems error-prone in the presence of
inheritance. Add a function instead. The Entry_section class overrides
this with a special version, since top-level sections are in fact images,
since Image inherits Entry_section.
Signed-off-by: Simon Glass
---
tools/binman/entry.py | 8
tools/binman/etype/fmap.py| 2 +-
tools/binman/etype/section.py | 17 ++---
tools/binman/image.py | 1 -
4 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/tools/binman/entry.py b/tools/binman/entry.py
index c4ddb43b318..ddf52d8e103 100644
--- a/tools/binman/entry.py
+++ b/tools/binman/entry.py
@@ -700,3 +700,11 @@ features to produce new behaviours.
data = self.ReadData(decomp)
self.ProcessContentsUpdate(data)
self.Detail('Loaded data size %x' % len(data))
+
+def GetImage(self):
+"""Get the image containing this entry
+
+Returns:
+Image object containing this entry
+"""
+return self.section.GetImage()
diff --git a/tools/binman/etype/fmap.py b/tools/binman/etype/fmap.py
index f8d8d866f13..56677cbac1c 100644
--- a/tools/binman/etype/fmap.py
+++ b/tools/binman/etype/fmap.py
@@ -49,7 +49,7 @@ class Entry_fmap(Entry):
areas.append(fmap_util.FmapArea(pos or 0, entry.size or 0,
tools.FromUnicode(entry.name), 0))
-entries = self.section.image.GetEntries()
+entries = self.GetImage().GetEntries()
areas = []
for entry in entries.values():
_AddEntries(areas, entry)
diff --git a/tools/binman/etype/section.py b/tools/binman/etype/section.py
index c875a79f1ff..0fb81419cea 100644
--- a/tools/binman/etype/section.py
+++ b/tools/binman/etype/section.py
@@ -45,8 +45,6 @@ class Entry_section(Entry):
def __init__(self, section, etype, node, test=False):
if not test:
Entry.__init__(self, section, etype, node)
-if section:
-self.image = section.image
self._entries = OrderedDict()
self._pad_byte = 0
self._sort = False
@@ -374,7 +372,7 @@ class Entry_section(Entry):
Image size as an integer number of bytes, which may be None if the
image size is dynamic and its sections have not yet been packed
"""
-return self.image.size
+return self.GetImage().size
def FindEntryType(self, etype):
"""Find an entry type in the section
@@ -468,3 +466,16 @@ class Entry_section(Entry):
for entry in self._entries.values():
entry.LoadData(decomp)
self.Detail('Loaded data')
+
+def GetImage(self):
+"""Get the image containing this section
+
+Note that a top-level section is actually an Image, so this function
may
+return self.
+
+Returns:
+Image object containing this section
+"""
+if not self.section:
+return self
+return self.section.GetImage()
diff --git a/tools/binman/image.py b/tools/binman/image.py
index 970d33f7110..c9908187343 100644
--- a/tools/binman/image.py
+++ b/tools/binman/image.py
@@ -42,7 +42,6 @@ class Image(section.Entry_section):
we create a section manually.
"""
def __init__(self, name, node, test=False):
-self.image = self
section.Entry_section.__init__(self, None, 'section', node, test)
self.name = 'main-section'
self.image_name = name
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 05/53] binman: Move image/fdt code into PrepareImagesAndDtbs()
Further reduce the size of the main Binman() function by moving this setup
code into its own function.
Note that the 'images' value is accessed from other modules so must be made
a global.
Signed-off-by: Simon Glass
---
tools/binman/control.py | 125 +++-
1 file changed, 71 insertions(+), 54 deletions(-)
diff --git a/tools/binman/control.py b/tools/binman/control.py
index a92056846d0..de9f29e2246 100644
--- a/tools/binman/control.py
+++ b/tools/binman/control.py
@@ -169,6 +169,75 @@ def ExtractEntries(image_fname, output_fname, outdir,
entry_paths,
return einfos
+def PrepareImagesAndDtbs(dtb_fname, select_images, update_fdt):
+"""Prepare the images to be processed and select the device tree
+
+This function:
+- reads in the device tree
+- finds and scans the binman node to create all entries
+- selects which images to build
+- Updates the device tress with placeholder properties for offset,
+image-pos, etc.
+
+Args:
+dtb_fname: Filename of the device tree file to use (.dts or .dtb)
+selected_images: List of images to output, or None for all
+update_fdt: True to update the FDT wth entry offsets, etc.
+"""
+# Import these here in case libfdt.py is not available, in which case
+# the above help option still works.
+import fdt
+import fdt_util
+global images
+
+# Get the device tree ready by compiling it and copying the compiled
+# output into a file in our output directly. Then scan it for use
+# in binman.
+dtb_fname = fdt_util.EnsureCompiled(dtb_fname)
+fname = tools.GetOutputFilename('u-boot.dtb.out')
+tools.WriteFile(fname, tools.ReadFile(dtb_fname))
+dtb = fdt.FdtScan(fname)
+
+node = _FindBinmanNode(dtb)
+if not node:
+raise ValueError("Device tree '%s' does not have a 'binman' "
+"node" % dtb_fname)
+
+images = _ReadImageDesc(node)
+
+if select_images:
+skip = []
+new_images = OrderedDict()
+for name, image in images.items():
+if name in select_images:
+new_images[name] = image
+else:
+skip.append(name)
+images = new_images
+tout.Notice('Skipping images: %s' % ', '.join(skip))
+
+state.Prepare(images, dtb)
+
+# Prepare the device tree by making sure that any missing
+# properties are added (e.g. 'pos' and 'size'). The values of these
+# may not be correct yet, but we add placeholders so that the
+# size of the device tree is correct. Later, in
+# SetCalculatedProperties() we will insert the correct values
+# without changing the device-tree size, thus ensuring that our
+# entry offsets remain the same.
+for image in images.values():
+image.ExpandEntries()
+if update_fdt:
+image.AddMissingProperties()
+image.ProcessFdt(dtb)
+
+for dtb_item in state.GetFdts():
+dtb_item.Sync(auto_resize=True)
+dtb_item.Pack()
+dtb_item.Flush()
+return images
+
+
def ProcessImage(image, update_fdt, write_map):
"""Perform all steps for this image, including checking and # writing it.
@@ -234,8 +303,6 @@ def Binman(args):
Args:
args: Command line arguments Namespace object
"""
-global images
-
if args.full_help:
pager = os.getenv('PAGER')
if not pager:
@@ -272,11 +339,6 @@ def Binman(args):
args.indir.append(board_pathname)
try:
-# Import these here in case libfdt.py is not available, in which case
-# the above help option still works.
-import fdt
-import fdt_util
-
tout.Init(args.verbosity)
elf.debug = args.debug
cbfs_util.VERBOSE = args.verbosity > 2
@@ -287,53 +349,8 @@ def Binman(args):
tools.SetToolPaths(args.toolpath)
state.SetEntryArgs(args.entry_arg)
-# Get the device tree ready by compiling it and copying the
compiled
-# output into a file in our output directly. Then scan it for use
-# in binman.
-dtb_fname = fdt_util.EnsureCompiled(dtb_fname)
-fname = tools.GetOutputFilename('u-boot.dtb.out')
-tools.WriteFile(fname, tools.ReadFile(dtb_fname))
-dtb = fdt.FdtScan(fname)
-
-node = _FindBinmanNode(dtb)
-if not node:
-raise ValueError("Device tree '%s' does not have a 'binman' "
- "node" % dtb_fname)
-
-images = _ReadImageDesc(node)
-
-if args.image:
-skip = []
-new_images = OrderedDict()
-for name, image in images.items():
-if name in args.image:
-new_images[name] = image
-else:
-skip.append(name)
-images = new_images
-
[U-Boot] [PATCH 52/53] binman: Correct the error message for invalid path
At present this message references -o for output file. But binman uses -f
now. Fix it.
Signed-off-by: Simon Glass
---
tools/binman/control.py | 4 ++--
tools/binman/ftest.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/binman/control.py b/tools/binman/control.py
index 232a38d9847..e6722c94593 100644
--- a/tools/binman/control.py
+++ b/tools/binman/control.py
@@ -138,9 +138,9 @@ def ExtractEntries(image_fname, output_fname, outdir,
entry_paths,
# Output an entry to a single file, as a special case
if output_fname:
if not entry_paths:
-raise ValueError('Must specify an entry path to write with -o')
+raise ValueError('Must specify an entry path to write with -f')
if len(entry_paths) != 1:
-raise ValueError('Must specify exactly one entry path to write
with -o')
+raise ValueError('Must specify exactly one entry path to write
with -f')
entry = image.FindEntryPath(entry_paths[0])
data = entry.ReadData(decomp)
tools.WriteFile(output_fname, data)
diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index e2246d80f8a..6a3396bfbb6 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -2683,7 +2683,7 @@ class TestFunctional(unittest.TestCase):
image_fname = tools.GetOutputFilename('image.bin')
with self.assertRaises(ValueError) as e:
control.ExtractEntries(image_fname, 'fname', None, [])
-self.assertIn('Must specify an entry path to write with -o',
+self.assertIn('Must specify an entry path to write with -f',
str(e.exception))
def testExtractTooManyEntryPaths(self):
@@ -2693,7 +2693,7 @@ class TestFunctional(unittest.TestCase):
image_fname = tools.GetOutputFilename('image.bin')
with self.assertRaises(ValueError) as e:
control.ExtractEntries(image_fname, 'fname', None, ['a', 'b'])
-self.assertIn('Must specify exactly one entry path to write with -o',
+self.assertIn('Must specify exactly one entry path to write with -f',
str(e.exception))
def testPackAlignSection(self):
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 19/53] binman: Support loading entry data from a file
When modifying an image it is convenient to load the data from the file
into each entry so that it can be reprocessed. Add a new LoadData() method
to handle this.
Signed-off-by: Simon Glass
---
tools/binman/entry.py | 5 +
tools/binman/etype/section.py | 5 +
2 files changed, 10 insertions(+)
diff --git a/tools/binman/entry.py b/tools/binman/entry.py
index e3c64348225..6436384254d 100644
--- a/tools/binman/entry.py
+++ b/tools/binman/entry.py
@@ -695,3 +695,8 @@ features to produce new behaviours.
(self.GetPath(), self.offset, self.offset + self.size,
self.size, len(data)))
return data[self.offset:self.offset + self.size]
+
+def LoadData(self, decomp=True):
+data = self.ReadData(decomp)
+self.ProcessContentsUpdate(data)
+self.Detail('Loaded data size %x' % len(data))
diff --git a/tools/binman/etype/section.py b/tools/binman/etype/section.py
index f29784c1bbf..cd623821a34 100644
--- a/tools/binman/etype/section.py
+++ b/tools/binman/etype/section.py
@@ -462,3 +462,8 @@ class Entry_section(Entry):
self.image_pos, None, self.offset, self)
for entry in self._entries.values():
entry.ListEntries(entries, indent + 1)
+
+def LoadData(self, decomp=True):
+for entry in self._entries.values():
+entry.LoadData(decomp)
+self.Detail('Loaded data')
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 17/53] dtoc: Update Fdt.GetNode() to handle the root node
This function currently fails if the root node is requested. Requesting
the root node is sometimes useful, so fix the bug.
Signed-off-by: Simon Glass
---
tools/dtoc/fdt.py | 2 ++
tools/dtoc/test_fdt.py | 5 +
2 files changed, 7 insertions(+)
diff --git a/tools/dtoc/fdt.py b/tools/dtoc/fdt.py
index b341ef3f83b..cd7673c7da0 100644
--- a/tools/dtoc/fdt.py
+++ b/tools/dtoc/fdt.py
@@ -574,6 +574,8 @@ class Fdt:
parts = path.split('/')
if len(parts) < 2:
return None
+if len(parts) == 2 and parts[1] == '':
+return node
for part in parts[1:]:
node = node.FindNode(part)
if not node:
diff --git a/tools/dtoc/test_fdt.py b/tools/dtoc/test_fdt.py
index c25248ca1f9..ed2d982a8fc 100755
--- a/tools/dtoc/test_fdt.py
+++ b/tools/dtoc/test_fdt.py
@@ -77,11 +77,16 @@ class TestFdt(unittest.TestCase):
"""Test the GetNode() method"""
node = self.dtb.GetNode('/spl-test')
self.assertTrue(isinstance(node, fdt.Node))
+
node = self.dtb.GetNode('/i2c@0/pmic@9')
self.assertTrue(isinstance(node, fdt.Node))
self.assertEqual('pmic@9', node.name)
self.assertIsNone(self.dtb.GetNode('/i2c@0/pmic@9/missing'))
+node = self.dtb.GetNode('/')
+self.assertTrue(isinstance(node, fdt.Node))
+self.assertEqual(0, node.Offset())
+
def testFlush(self):
"""Check that we can flush the device tree out to its file"""
fname = self.dtb._fname
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 23/53] binman: Adjust Entry to read the node in a separate call
At present the Entry constructor sets up the object and then immediately
reads its device-tree node to obtain its properties.
This breaks a convention that constructors should not do any processing.
A consequence is that we must pass all arguments to the constructor and
cannot have the node-reading proceed in a different way unless we pass
flags to that constructor. We already have a 'test' flag in a few cases,
and now need to control whether the 'orig_offset' and 'orig_size'
properties are set or not.
Adjust the code to require a separate call to ReadNode() after
construction. The Image class remains as it was.
Signed-off-by: Simon Glass
---
tools/binman/entry.py| 6 +++---
tools/binman/entry_test.py | 8
tools/binman/etype/_testing.py | 3 +++
tools/binman/etype/cbfs.py | 1 +
tools/binman/etype/fill.py | 3 +++
tools/binman/etype/intel_ifwi.py | 1 +
tools/binman/etype/section.py| 29 +++--
tools/binman/image.py| 10 +++---
8 files changed, 37 insertions(+), 24 deletions(-)
diff --git a/tools/binman/entry.py b/tools/binman/entry.py
index 6436384254d..c4ddb43b318 100644
--- a/tools/binman/entry.py
+++ b/tools/binman/entry.py
@@ -70,7 +70,7 @@ class Entry(object):
orig_offset: Original offset value read from node
orig_size: Original size value read from node
"""
-def __init__(self, section, etype, node, read_node=True, name_prefix=''):
+def __init__(self, section, etype, node, name_prefix=''):
self.section = section
self.etype = etype
self._node = node
@@ -89,8 +89,6 @@ class Entry(object):
self.image_pos = None
self._expand_size = False
self.compress = 'none'
-if read_node:
-self.ReadNode()
@staticmethod
def Lookup(node_path, etype):
@@ -155,6 +153,8 @@ class Entry(object):
def ReadNode(self):
"""Read entry information from the node
+This must be called as the first thing after the Entry is created.
+
This reads all the fields we recognise from the node, ready for use.
"""
if 'pos' in self._node.props:
diff --git a/tools/binman/entry_test.py b/tools/binman/entry_test.py
index 460171ba899..ee729f37519 100644
--- a/tools/binman/entry_test.py
+++ b/tools/binman/entry_test.py
@@ -57,7 +57,7 @@ class TestEntry(unittest.TestCase):
def testEntryContents(self):
"""Test the Entry bass class"""
import entry
-base_entry = entry.Entry(None, None, None, read_node=False)
+base_entry = entry.Entry(None, None, None)
self.assertEqual(True, base_entry.ObtainContents())
def testUnknownEntry(self):
@@ -73,15 +73,15 @@ class TestEntry(unittest.TestCase):
"""Test Entry.GetUniqueName"""
Node = collections.namedtuple('Node', ['name', 'parent'])
base_node = Node('root', None)
-base_entry = entry.Entry(None, None, base_node, read_node=False)
+base_entry = entry.Entry(None, None, base_node)
self.assertEqual('root', base_entry.GetUniqueName())
sub_node = Node('subnode', base_node)
-sub_entry = entry.Entry(None, None, sub_node, read_node=False)
+sub_entry = entry.Entry(None, None, sub_node)
self.assertEqual('root.subnode', sub_entry.GetUniqueName())
def testGetDefaultFilename(self):
"""Trivial test for this base class function"""
-base_entry = entry.Entry(None, None, None, read_node=False)
+base_entry = entry.Entry(None, None, None)
self.assertIsNone(base_entry.GetDefaultFilename())
def testBlobFdt(self):
diff --git a/tools/binman/etype/_testing.py b/tools/binman/etype/_testing.py
index ae24fe8105a..4a2e4eb7caf 100644
--- a/tools/binman/etype/_testing.py
+++ b/tools/binman/etype/_testing.py
@@ -42,6 +42,9 @@ class Entry__testing(Entry):
"""
def __init__(self, section, etype, node):
Entry.__init__(self, section, etype, node)
+
+def ReadNode(self):
+Entry.ReadNode(self)
self.return_invalid_entry = fdt_util.GetBool(self._node,
'return-invalid-entry')
self.return_unknown_contents = fdt_util.GetBool(self._node,
diff --git a/tools/binman/etype/cbfs.py b/tools/binman/etype/cbfs.py
index edf2189fd26..d73c706c444 100644
--- a/tools/binman/etype/cbfs.py
+++ b/tools/binman/etype/cbfs.py
@@ -203,6 +203,7 @@ class Entry_cbfs(Entry):
"""Read the subnodes to find out what should go in this IFWI"""
for node in self._node.subnodes:
entry = Entry.Create(self.section, node)
+entry.ReadNode()
entry._cbfs_name = fdt_util.GetString(node, 'cbfs-name',
entry.name)
entry._type = fdt_util.GetString(node, 'cbfs-type')
compress = fdt_util.GetString(node, 'cbfs-compress', 'none')
diff --git a/tools/binman/etype/fill.py
[U-Boot] [PATCH 18/53] binman: Store image fdtmap when loading from a file
This data provides all the information about the position and size of each
entry. Store it for later use when loading an image. It can be reused as
is if the image is modified without changing offsets/sizes.
Signed-off-by: Simon Glass
---
tools/binman/image.py | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/tools/binman/image.py b/tools/binman/image.py
index fb6e591ca60..232e752258c 100644
--- a/tools/binman/image.py
+++ b/tools/binman/image.py
@@ -32,6 +32,9 @@ class Image(section.Entry_section):
Attributes:
filename: Output filename for image
+image_node: Name of node containing the description for this image
+fdtmap_dtb: Fdt object for the fdtmap when loading from a file
+fdtmap_data: Contents of the fdtmap when loading from a file
Args:
test: True if this is being called from a test of Images. This this
case
@@ -44,6 +47,8 @@ class Image(section.Entry_section):
self.name = 'main-section'
self.image_name = name
self._filename = '%s.bin' % self.image_name
+self.fdtmap_dtb = None
+self.fdtmap_data = None
if not test:
filename = fdt_util.GetString(self._node, 'filename')
if filename:
@@ -82,7 +87,11 @@ class Image(section.Entry_section):
dtb.Scan()
# Return an Image with the associated nodes
-image = Image('image', dtb.GetRoot())
+root = dtb.GetRoot()
+image = Image('image', root)
+image.image_node = fdt_util.GetString(root, 'image-node', 'image')
+image.fdtmap_dtb = dtb
+image.fdtmap_data = fdtmap_data
image._data = data
return image
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 06/53] binman: Convert GetFdtSet() to use a dict
At present this function returns a set of device-tree filenames. It has no
way of returning the actual device-tree object. Change it to a dictionary
so that we can add this feature in a future patch.
Also drop fdt_set since it is no-longer used.
Signed-off-by: Simon Glass
---
tools/binman/entry.py | 12 +++-
tools/binman/etype/blob_dtb.py | 11 ++-
tools/binman/etype/section.py | 8
tools/binman/state.py | 14 ++
4 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/tools/binman/entry.py b/tools/binman/entry.py
index 276035ed324..2ed9dc0d6f4 100644
--- a/tools/binman/entry.py
+++ b/tools/binman/entry.py
@@ -185,14 +185,16 @@ class Entry(object):
def GetDefaultFilename(self):
return None
-def GetFdtSet(self):
-"""Get the set of device trees used by this entry
+def GetFdts(self):
+"""Get the device trees used by this entry
Returns:
-Set containing the filename from this entry, if it is a .dtb, else
-an empty set
+Empty dict, if this entry is not a .dtb, otherwise:
+Dict:
+key: Filename from this entry (without the path)
+value: Fdt object for this dtb, or None if not available
"""
-return set()
+return {}
def ExpandEntries(self):
pass
diff --git a/tools/binman/etype/blob_dtb.py b/tools/binman/etype/blob_dtb.py
index b242c2da38a..b70c3d3a3a2 100644
--- a/tools/binman/etype/blob_dtb.py
+++ b/tools/binman/etype/blob_dtb.py
@@ -32,11 +32,12 @@ class Entry_blob_dtb(Entry_blob):
data = self.CompressData(indata)
return self.ProcessContentsUpdate(data)
-def GetFdtSet(self):
-"""Get the set of device trees used by this entry
+def GetFdts(self):
+"""Get the device trees used by this entry
Returns:
-Set containing the filename from this entry
+Dict:
+key: Filename from this entry (without the path)
+value: Fdt object for this dtb, or None if not available
"""
-fname = self.GetDefaultFilename()
-return set([fname])
+return {self.GetDefaultFilename(): None}
diff --git a/tools/binman/etype/section.py b/tools/binman/etype/section.py
index 6db3c7a6f03..cdd8618c48b 100644
--- a/tools/binman/etype/section.py
+++ b/tools/binman/etype/section.py
@@ -95,11 +95,11 @@ class Entry_section(Entry):
entry.SetPrefix(self._name_prefix)
self._entries[node.name] = entry
-def GetFdtSet(self):
-fdt_set = set()
+def GetFdts(self):
+fdts = {}
for entry in self._entries.values():
-fdt_set.update(entry.GetFdtSet())
-return fdt_set
+fdts.update(entry.GetFdts())
+return fdts
def ProcessFdt(self, fdt):
"""Allow entries to adjust the device tree
diff --git a/tools/binman/state.py b/tools/binman/state.py
index 382bda32219..5b9e005df96 100644
--- a/tools/binman/state.py
+++ b/tools/binman/state.py
@@ -22,11 +22,8 @@ entry_args = {}
# ftest.py)
use_fake_dtb = False
-# Set of all device tree files references by images
-fdt_set = set()
-
-# Same as above, but excluding the main one
-fdt_subset = set()
+# Dict of device trees, keyed by filename, but excluding the main one
+fdt_subset = {}
# The DTB which contains the full image information
main_dtb = None
@@ -140,11 +137,12 @@ def Prepare(images, dtb):
main_dtb = dtb
fdt_files.clear()
fdt_files['u-boot.dtb'] = dtb
-fdt_subset = set()
+fdt_subset = {}
if not use_fake_dtb:
for image in images.values():
-fdt_subset.update(image.GetFdtSet())
-fdt_subset.discard('u-boot.dtb')
+fdt_subset.update(image.GetFdts())
+if 'u-boot.dtb' in fdt_subset:
+del fdt_subset['u-boot.dtb']
for other_fname in fdt_subset:
infile = tools.GetInputFilename(other_fname)
other_fname_dtb = fdt_util.EnsureCompiled(infile)
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 07/53] binman: Rename state.GetFdts()
This function name conflicts with Entry.GetFdts() which has a different purpose. Rename it to avoid confusion. Also update a stale comment relating to this function. Signed-off-by: Simon Glass --- tools/binman/control.py | 6 +++--- tools/binman/state.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/binman/control.py b/tools/binman/control.py index de9f29e2246..8700f48ad55 100644 --- a/tools/binman/control.py +++ b/tools/binman/control.py @@ -231,7 +231,7 @@ def PrepareImagesAndDtbs(dtb_fname, select_images, update_fdt): image.AddMissingProperties() image.ProcessFdt(dtb) -for dtb_item in state.GetFdts(): +for dtb_item in state.GetAllFdts(): dtb_item.Sync(auto_resize=True) dtb_item.Pack() dtb_item.Flush() @@ -278,7 +278,7 @@ def ProcessImage(image, update_fdt, write_map): image.SetImagePos() if update_fdt: image.SetCalculatedProperties() -for dtb_item in state.GetFdts(): +for dtb_item in state.GetAllFdts(): dtb_item.Sync() sizes_ok = image.ProcessEntryContents() if sizes_ok: @@ -355,7 +355,7 @@ def Binman(args): ProcessImage(image, args.update_fdt, args.map) # Write the updated FDTs to our output files -for dtb_item in state.GetFdts(): +for dtb_item in state.GetAllFdts(): tools.WriteFile(dtb_item._fname, dtb_item.GetContents()) finally: diff --git a/tools/binman/state.py b/tools/binman/state.py index 5b9e005df96..77c7024f5a7 100644 --- a/tools/binman/state.py +++ b/tools/binman/state.py @@ -117,8 +117,8 @@ def GetEntryArg(name): def Prepare(images, dtb): """Get device tree files ready for use -This sets up a set of device tree files that can be retrieved by GetFdts(). -At present there is only one, that for U-Boot proper. +This sets up a set of device tree files that can be retrieved by +GetAllFdts(). This includes U-Boot proper and any SPL device trees. Args: images: List of images being used @@ -152,7 +152,7 @@ def Prepare(images, dtb): other_dtb = fdt.FdtScan(out_fname) fdt_files[other_fname] = other_dtb -def GetFdts(): +def GetAllFdts(): """Yield all device tree files being used by binman Yields: -- 2.22.0.657.g960e92d24f-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 43/53] binman: Update Entry.WriteData() to handle special sections
At present this method assumes that the parent section does not need
to recalculate its position or adjust any metadata it may contain. But
when the entry changes size this may not be true. Also if the parent
section is more than just a container (e.g. it is a CBFS) then the
section may need to regenerate its output.
Add a new WriteChildData() method to sections and call this from the
WriteData() method, to handle this situation.
Signed-off-by: Simon Glass
---
tools/binman/entry.py | 21 -
tools/binman/etype/cbfs.py| 8 ++--
tools/binman/etype/section.py | 3 +++
3 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/tools/binman/entry.py b/tools/binman/entry.py
index 8416214fc93..6a2c6e0d92e 100644
--- a/tools/binman/entry.py
+++ b/tools/binman/entry.py
@@ -751,7 +751,26 @@ features to produce new behaviours.
self.contents_size = self.size
ok = self.ProcessContentsUpdate(data)
self.Detail('WriteData: size=%x, ok=%s' % (len(data), ok))
-return ok
+section_ok = self.section.WriteChildData(self)
+return ok and section_ok
+
+def WriteChildData(self, child):
+"""Handle writing the data in a child entry
+
+This should be called on the child's parent section after the child's
+data has been updated. It
+
+This base-class implementation does nothing, since the base Entry
object
+does not have any children.
+
+Args:
+child: Child Entry that was written
+
+Returns:
+True if the section could be updated successfully, False if the
+data is such that the section could not updat
+"""
+return True
def GetSiblingOrder(self):
"""Get the relative order of an entry amoung its siblings
diff --git a/tools/binman/etype/cbfs.py b/tools/binman/etype/cbfs.py
index 2bcdf2fd433..0109fdbb918 100644
--- a/tools/binman/etype/cbfs.py
+++ b/tools/binman/etype/cbfs.py
@@ -169,7 +169,7 @@ class Entry_cbfs(Entry):
self._cbfs_entries = OrderedDict()
self._ReadSubnodes()
-def ObtainContents(self):
+def ObtainContents(self, skip=None):
arch = cbfs_util.find_arch(self._cbfs_arg)
if arch is None:
self.Raise("Invalid architecture '%s'" % self._cbfs_arg)
@@ -179,7 +179,7 @@ class Entry_cbfs(Entry):
for entry in self._cbfs_entries.values():
# First get the input data and put it in a file. If not available,
# try later.
-if not entry.ObtainContents():
+if entry != skip and not entry.ObtainContents():
return False
data = entry.GetData()
cfile = None
@@ -274,3 +274,7 @@ class Entry_cbfs(Entry):
reader = self.reader
cfile = reader.files.get(child.name)
return cfile.data if decomp else cfile.orig_data
+
+def WriteChildData(self, child):
+self.ObtainContents(skip=child)
+return True
diff --git a/tools/binman/etype/section.py b/tools/binman/etype/section.py
index 855e291bc43..5d34fc546af 100644
--- a/tools/binman/etype/section.py
+++ b/tools/binman/etype/section.py
@@ -520,3 +520,6 @@ class Entry_section(Entry):
(child.GetPath(), len(indata), child.compress,
len(data)))
return data
+
+def WriteChildData(self, child):
+return True
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 42/53] binman: Update Entry.ReadEntry() to work through classes
At present we simply extract the data directly from entries using the
image_pos information. This happens to work on current entry types, but
cannot work if the entry type encodes the data in some way. Update the
ReadData() method to provide the data by calling a new ReadChildData()
method in the parent. This allows the entry_Section class, or possibly
any other container class, to return the correct data in all cases.
Signed-off-by: Simon Glass
---
tools/binman/entry.py | 7 ++-
tools/binman/etype/blob.py| 12
tools/binman/etype/cbfs.py| 12
tools/binman/etype/section.py | 32
4 files changed, 46 insertions(+), 17 deletions(-)
diff --git a/tools/binman/entry.py b/tools/binman/entry.py
index 90192c11b77..8416214fc93 100644
--- a/tools/binman/entry.py
+++ b/tools/binman/entry.py
@@ -714,11 +714,8 @@ features to produce new behaviours.
"""
# Use True here so that we get an uncompressed section to work from,
# although compressed sections are currently not supported
-data = self.section.ReadData(True)
-tout.Info('%s: Reading data from offset %#x-%#x, size %#x (avail %#x)'
%
- (self.GetPath(), self.offset, self.offset + self.size,
- self.size, len(data)))
-return data[self.offset:self.offset + self.size]
+data = self.section.ReadChildData(self, decomp)
+return data
def LoadData(self, decomp=True):
data = self.ReadData(decomp)
diff --git a/tools/binman/etype/blob.py b/tools/binman/etype/blob.py
index 00cad33718c..d15d0789e52 100644
--- a/tools/binman/etype/blob.py
+++ b/tools/binman/etype/blob.py
@@ -67,15 +67,3 @@ class Entry_blob(Entry):
def GetDefaultFilename(self):
return self._filename
-
-def ReadData(self, decomp=True):
-indata = Entry.ReadData(self, decomp)
-if decomp:
-data = tools.Decompress(indata, self.compress)
-if self.uncomp_size:
-tout.Info("%s: Decompressing data size %#x with algo '%s' to
data size %#x" %
- (self.GetPath(), len(indata), self.compress,
- len(data)))
-else:
-data = indata
-return data
diff --git a/tools/binman/etype/cbfs.py b/tools/binman/etype/cbfs.py
index d73c706c444..2bcdf2fd433 100644
--- a/tools/binman/etype/cbfs.py
+++ b/tools/binman/etype/cbfs.py
@@ -262,3 +262,15 @@ class Entry_cbfs(Entry):
def GetEntries(self):
return self._cbfs_entries
+
+def ReadData(self, decomp=True):
+data = Entry.ReadData(self, True)
+return data
+
+def ReadChildData(self, child, decomp=True):
+if not self.reader:
+data = Entry.ReadData(self, True)
+self.reader = cbfs_util.CbfsReader(data)
+reader = self.reader
+cfile = reader.files.get(child.name)
+return cfile.data if decomp else cfile.orig_data
diff --git a/tools/binman/etype/section.py b/tools/binman/etype/section.py
index 3ce013d5029..855e291bc43 100644
--- a/tools/binman/etype/section.py
+++ b/tools/binman/etype/section.py
@@ -17,6 +17,7 @@ import sys
from entry import Entry
import fdt_util
import tools
+import tout
class Entry_section(Entry):
@@ -488,3 +489,34 @@ class Entry_section(Entry):
they appear in the device tree
"""
return self._sort
+
+def ReadData(self, decomp=True):
+tout.Info("ReadData path='%s'" % self.GetPath())
+parent_data = self.section.ReadData(True)
+tout.Info('%s: Reading data from offset %#x-%#x, size %#x' %
+ (self.GetPath(), self.offset, self.offset + self.size,
+ self.size))
+data = parent_data[self.offset:self.offset + self.size]
+return data
+
+def ReadChildData(self, child, decomp=True):
+"""Read the data for a particular child entry
+
+Args:
+child: Child entry to read data for
+decomp: True to return uncompressed data, False to leave the data
+compressed if it is compressed
+
+Returns:
+Data contents of entry
+"""
+parent_data = self.ReadData(True)
+data = parent_data[child.offset:child.offset + child.size]
+if decomp:
+indata = data
+data = tools.Decompress(indata, child.compress)
+if child.uncomp_size:
+tout.Info("%s: Decompressing data size %#x with algo '%s' to
data size %#x" %
+(child.GetPath(), len(indata), child.compress,
+len(data)))
+return data
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 37/53] libfdt: Copy the struct region in fdt_resize()
At present this function appears to copy only the data before the struct region and the data in the string region. It does not seem to copy the struct region itself. From the arguments of this function it seems that it should support fdt and buf being different. This patch attempts to fix this problem. Upstream commit: c72fa77 libfdt: Copy the struct region in fdt_resize() Signed-off-by: Simon Glass --- scripts/dtc/libfdt/fdt_sw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/dtc/libfdt/fdt_sw.c b/scripts/dtc/libfdt/fdt_sw.c index 6d33cc29d02..d8ef748a721 100644 --- a/scripts/dtc/libfdt/fdt_sw.c +++ b/scripts/dtc/libfdt/fdt_sw.c @@ -114,7 +114,7 @@ int fdt_resize(void *fdt, void *buf, int bufsize) FDT_SW_CHECK_HEADER(fdt); - headsize = fdt_off_dt_struct(fdt); + headsize = fdt_off_dt_struct(fdt) + fdt_size_dt_struct(fdt); tailsize = fdt_size_dt_strings(fdt); if ((headsize + tailsize) > bufsize) -- 2.22.0.657.g960e92d24f-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 41/53] binman: Add a prefix before CBFS hex offsets
Add a 0x prefix to these errors to avoid confusion.
Signed-off-by: Simon Glass
---
tools/binman/cbfs_util.py | 4 ++--
tools/binman/cbfs_util_test.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/binman/cbfs_util.py b/tools/binman/cbfs_util.py
index 45e16da0aaa..6d9a876ee85 100644
--- a/tools/binman/cbfs_util.py
+++ b/tools/binman/cbfs_util.py
@@ -715,7 +715,7 @@ class CbfsReader(object):
file_pos = fd.tell()
data = fd.read(FILE_HEADER_LEN)
if len(data) < FILE_HEADER_LEN:
-print('File header at %x ran out of data' % file_pos)
+print('File header at %#x ran out of data' % file_pos)
return False
magic, size, ftype, attr, offset = struct.unpack(FILE_HEADER_FORMAT,
data)
@@ -724,7 +724,7 @@ class CbfsReader(object):
pos = fd.tell()
name = self._read_string(fd)
if name is None:
-print('String at %x ran out of data' % pos)
+print('String at %#x ran out of data' % pos)
return False
if DEBUG:
diff --git a/tools/binman/cbfs_util_test.py b/tools/binman/cbfs_util_test.py
index 0fe4aa494ec..772c794eceb 100755
--- a/tools/binman/cbfs_util_test.py
+++ b/tools/binman/cbfs_util_test.py
@@ -372,7 +372,7 @@ class TestCbfs(unittest.TestCase):
with io.BytesIO(newdata) as fd:
fd.seek(pos)
self.assertEqual(False, cbr._read_next_file(fd))
-self.assertIn('File header at 0 ran out of data', stdout.getvalue())
+self.assertIn('File header at 0x0 ran out of data', stdout.getvalue())
def test_cbfs_bad_file_string(self):
"""Check handling of an incomplete filename string"""
@@ -394,7 +394,7 @@ class TestCbfs(unittest.TestCase):
with io.BytesIO(newdata) as fd:
fd.seek(pos)
self.assertEqual(False, cbr._read_next_file(fd))
-self.assertIn('String at %x ran out of data' %
+self.assertIn('String at %#x ran out of data' %
cbfs_util.FILE_HEADER_LEN, stdout.getvalue())
def test_cbfs_debug(self):
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 29/53] binman: Add info to allow safely repacking an image later
At present it is not possible to discover the contraints to repacking an
image (e.g. maximum section size) since this information is not preserved
from the original image description.
Add new 'orig-offset' and 'orig-size' properties to hold this. Add them to
the main device tree in the image.
Signed-off-by: Simon Glass
---
tools/binman/README | 23 ++
tools/binman/README.entries | 8 ++-
tools/binman/entry.py | 18 -
tools/binman/etype/fdtmap.py | 3 +
tools/binman/ftest.py | 70 ++-
tools/binman/image.py | 13 +++-
tools/binman/state.py | 21 --
.../binman/test/134_fdt_update_all_repack.dts | 23 ++
8 files changed, 165 insertions(+), 14 deletions(-)
create mode 100644 tools/binman/test/134_fdt_update_all_repack.dts
diff --git a/tools/binman/README b/tools/binman/README
index 35223545194..6a1cd110a4c 100644
--- a/tools/binman/README
+++ b/tools/binman/README
@@ -481,6 +481,29 @@ name-prefix:
distinguish binaries with otherwise identical names.
+Image Properties
+
+
+Image nodes act like sections but also have a few extra properties:
+
+filename:
+ Output filename for the image. This defaults to image.bin (or in the
+ case of multiple images .bin where is the name of
+ the image node.
+
+allow-repack:
+ Create an image that can be repacked. With this option it is possible
+ to change anything in the image after it is created, including updating
+ the position and size of image components. By default this is not
+ permitted since it is not possibly to know whether this might violate a
+ constraint in the image description. For example, if a section has to
+ increase in size to hold a larger binary, that might cause the section
+ to fall out of its allow region (e.g. read-only portion of flash).
+
+ Adding this property causes the original offset and size values in the
+ image description to be stored in the FDT and fdtmap.
+
+
Entry Documentation
---
diff --git a/tools/binman/README.entries b/tools/binman/README.entries
index 7ce88ee5da8..37b8b4c4f98 100644
--- a/tools/binman/README.entries
+++ b/tools/binman/README.entries
@@ -230,7 +230,9 @@ Properties / Entry arguments:
None
An FDT map is just a header followed by an FDT containing a list of all the
-entries in the image.
+entries in the image. The root node corresponds to the image node in the
+original FDT, and an image-name property indicates the image name in that
+original tree.
The header is the string _FDTMAP_ followed by 8 unused bytes.
@@ -244,6 +246,7 @@ FDT with the position of each entry.
Example output for a simple image with U-Boot and an FDT map:
/ {
+image-name = "binman";
size = <0x0112>;
image-pos = <0x>;
offset = <0x>;
@@ -259,6 +262,9 @@ Example output for a simple image with U-Boot and an FDT
map:
};
};
+If allow-repack is used then 'orig-offset' and 'orig-size' properties are
+added as necessary. See the binman README.
+
Entry: files: Entry containing a set of files
diff --git a/tools/binman/entry.py b/tools/binman/entry.py
index 07d5838c1a2..74e280849c4 100644
--- a/tools/binman/entry.py
+++ b/tools/binman/entry.py
@@ -161,8 +161,11 @@ class Entry(object):
self.Raise("Please use 'offset' instead of 'pos'")
self.offset = fdt_util.GetInt(self._node, 'offset')
self.size = fdt_util.GetInt(self._node, 'size')
-self.orig_offset = self.offset
-self.orig_size = self.size
+self.orig_offset = fdt_util.GetInt(self._node, 'orig-offset')
+self.orig_size = fdt_util.GetInt(self._node, 'orig-size')
+if self.GetImage().copy_to_orig:
+self.orig_offset = self.offset
+self.orig_size = self.size
# These should not be set in input files, but are set in an FDT map,
# which is also read by this code.
@@ -207,6 +210,12 @@ class Entry(object):
for prop in ['offset', 'size', 'image-pos']:
if not prop in self._node.props:
state.AddZeroProp(self._node, prop)
+if self.GetImage().allow_repack:
+if self.orig_offset is not None:
+state.AddZeroProp(self._node, 'orig-offset', True)
+if self.orig_size is not None:
+state.AddZeroProp(self._node, 'orig-size', True)
+
if self.compress != 'none':
state.AddZeroProp(self._node, 'uncomp-size')
err = state.CheckAddHashProp(self._node)
@@ -219,6 +228,11 @@ class Entry(object):
state.SetInt(self._node, 'size', self.size)
base = self.section.GetRootSkipAtStart() if self.section else 0
state.SetInt(self._node, 'image-pos', self.image_pos - base)
+if
[U-Boot] [PATCH 44/53] binman: Support replacing data in a cbfs
At present binman cannot replace data within a CBFS since it does not
allow rewriting of the files in that CBFS. Implement this by using the
new WriteData() method to handle the case.
Add a header to compressed data so that the amount of compressed data can
be determined without reference to the size of the containing entry. This
allows the entry to be larger that the contents, without causing errors in
decompression. This is necessary to cope with a compressed device tree
being updated in such a way that it shrinks after the entry size is
already set (an obscure case). It is not used with CBFS since it has its
own metadata for this. Increase the number of passes allowed to resolve
the position of entries, to handle this case.
Add a test for this new logic.
Signed-off-by: Simon Glass
---
tools/binman/cbfs_util.py | 10 ---
tools/binman/control.py| 2 +-
tools/binman/entry_test.py | 5
tools/binman/etype/cbfs.py | 3 ++-
tools/binman/ftest.py | 26 +-
tools/binman/test/142_replace_cbfs.dts | 37 ++
tools/patman/tools.py | 11 ++--
7 files changed, 85 insertions(+), 9 deletions(-)
create mode 100644 tools/binman/test/142_replace_cbfs.dts
diff --git a/tools/binman/cbfs_util.py b/tools/binman/cbfs_util.py
index 6d9a876ee85..99d77878c9a 100644
--- a/tools/binman/cbfs_util.py
+++ b/tools/binman/cbfs_util.py
@@ -208,6 +208,7 @@ class CbfsFile(object):
cbfs_offset: Offset of file data in bytes from start of CBFS, or None
to
place this file anyway
data: Contents of file, uncompressed
+orig_data: Original data added to the file, possibly compressed
data_len: Length of (possibly compressed) data in bytes
ftype: File type (TYPE_...)
compression: Compression type (COMPRESS_...)
@@ -226,6 +227,7 @@ class CbfsFile(object):
self.offset = None
self.cbfs_offset = cbfs_offset
self.data = data
+self.orig_data = data
self.ftype = ftype
self.compress = compress
self.memlen = None
@@ -240,9 +242,9 @@ class CbfsFile(object):
"""Handle decompressing data if necessary"""
indata = self.data
if self.compress == COMPRESS_LZ4:
-data = tools.Decompress(indata, 'lz4')
+data = tools.Decompress(indata, 'lz4', with_header=False)
elif self.compress == COMPRESS_LZMA:
-data = tools.Decompress(indata, 'lzma')
+data = tools.Decompress(indata, 'lzma', with_header=False)
else:
data = indata
self.memlen = len(data)
@@ -361,9 +363,9 @@ class CbfsFile(object):
elif self.ftype == TYPE_RAW:
orig_data = data
if self.compress == COMPRESS_LZ4:
-data = tools.Compress(orig_data, 'lz4')
+data = tools.Compress(orig_data, 'lz4', with_header=False)
elif self.compress == COMPRESS_LZMA:
-data = tools.Compress(orig_data, 'lzma')
+data = tools.Compress(orig_data, 'lzma', with_header=False)
self.memlen = len(orig_data)
self.data_len = len(data)
attr = struct.pack(ATTR_COMPRESSION_FORMAT,
diff --git a/tools/binman/control.py b/tools/binman/control.py
index 22e3e306e54..9c8bc6253fc 100644
--- a/tools/binman/control.py
+++ b/tools/binman/control.py
@@ -311,7 +311,7 @@ def ProcessImage(image, update_fdt, write_map,
get_contents=True,
# since changing an offset from 0x100 to 0x104 (for example) can
# alter the compressed size of the device tree. So we need a
# third pass for this.
-passes = 3
+passes = 5
for pack_pass in range(passes):
try:
image.PackEntries()
diff --git a/tools/binman/entry_test.py b/tools/binman/entry_test.py
index ee729f37519..cc1fb795da5 100644
--- a/tools/binman/entry_test.py
+++ b/tools/binman/entry_test.py
@@ -92,6 +92,11 @@ class TestEntry(unittest.TestCase):
dtb = entry.Entry.Create(None, self.GetNode(), 'u-boot-dtb')
self.assertEqual('u-boot-dtb', dtb.GetFdtEtype())
+def testWriteChildData(self):
+"""Test the WriteChildData() method of the base class"""
+base = entry.Entry.Create(None, self.GetNode(), 'blob-dtb')
+self.assertTrue(base.WriteChildData(base))
+
if __name__ == "__main__":
unittest.main()
diff --git a/tools/binman/etype/cbfs.py b/tools/binman/etype/cbfs.py
index 0109fdbb918..28a9c81a8ad 100644
--- a/tools/binman/etype/cbfs.py
+++ b/tools/binman/etype/cbfs.py
@@ -168,6 +168,7 @@ class Entry_cbfs(Entry):
self._cbfs_arg = fdt_util.GetString(node, 'cbfs-arch', 'x86')
self._cbfs_entries = OrderedDict()
self._ReadSubnodes()
+self.reader = None
def ObtainContents(self, skip=None):
arch = cbfs_util.find_arch(self._cbfs_arg)
@@ -202,7 +203,7 @@ class
[U-Boot] [PATCH 33/53] binman: Add more tests for image header position
The positioning does not currently work correctly if at the end of an
image with no fixed size. Also if the header is in the middle of an image
it can cause a gap in the image since the header position is normally at
the image end, so entries after it are placed after the end of the image.
Fix these problems and add more tests to cover these cases.
Signed-off-by: Simon Glass
---
tools/binman/entry.py | 15 +++
tools/binman/etype/image_header.py| 16 ++--
tools/binman/etype/section.py | 9 +++
tools/binman/ftest.py | 25 +++
tools/binman/test/135_fdtmap_hdr_middle.dts | 16
tools/binman/test/136_fdtmap_hdr_startbad.dts | 16
tools/binman/test/137_fdtmap_hdr_endbad.dts | 16
tools/binman/test/138_fdtmap_hdr_nosize.dts | 16
8 files changed, 127 insertions(+), 2 deletions(-)
create mode 100644 tools/binman/test/135_fdtmap_hdr_middle.dts
create mode 100644 tools/binman/test/136_fdtmap_hdr_startbad.dts
create mode 100644 tools/binman/test/137_fdtmap_hdr_endbad.dts
create mode 100644 tools/binman/test/138_fdtmap_hdr_nosize.dts
diff --git a/tools/binman/entry.py b/tools/binman/entry.py
index 74e280849c4..8dacc61f5a1 100644
--- a/tools/binman/entry.py
+++ b/tools/binman/entry.py
@@ -745,3 +745,18 @@ features to produce new behaviours.
ok = self.ProcessContentsUpdate(data)
self.Detail('WriteData: size=%x, ok=%s' % (len(data), ok))
return ok
+
+def GetSiblingOrder(self):
+"""Get the relative order of an entry amoung its siblings
+
+Returns:
+'start' if this entry is first among siblings, 'end' if last,
+otherwise None
+"""
+entries = list(self.section.GetEntries().values())
+if entries:
+if self == entries[0]:
+return 'start'
+elif self == entries[-1]:
+return 'end'
+return 'middle'
diff --git a/tools/binman/etype/image_header.py
b/tools/binman/etype/image_header.py
index 8f9c5aa5d9e..4b69eda1a22 100644
--- a/tools/binman/etype/image_header.py
+++ b/tools/binman/etype/image_header.py
@@ -86,8 +86,20 @@ class Entry_image_header(Entry):
if self.location not in ['start', 'end']:
self.Raise("Invalid location '%s', expected 'start' or 'end'" %
self.location)
-image_size = self.section.GetImageSize() or 0
-self.offset = (0 if self.location != 'end' else image_size - 8)
+order = self.GetSiblingOrder()
+if self.location != order and not self.section.GetSort():
+self.Raise("Invalid sibling order '%s' for image-header: Must
be at '%s' to match location" %
+ (order, self.location))
+if self.location != 'end':
+offset = 0
+else:
+image_size = self.section.GetImageSize()
+if image_size is None:
+# We don't know the image, but this must be the last entry,
+# so we can assume it goes
+offset = offset
+else:
+offset = image_size - IMAGE_HEADER_LEN
return Entry.Pack(self, offset)
def ProcessContents(self):
diff --git a/tools/binman/etype/section.py b/tools/binman/etype/section.py
index 0fb81419cea..3ce013d5029 100644
--- a/tools/binman/etype/section.py
+++ b/tools/binman/etype/section.py
@@ -479,3 +479,12 @@ class Entry_section(Entry):
if not self.section:
return self
return self.section.GetImage()
+
+def GetSort(self):
+"""Check if the entries in this section will be sorted
+
+Returns:
+True if to be sorted, False if entries will be left in the order
+they appear in the device tree
+"""
+return self._sort
diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index b67e8a15086..bc751893edb 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -2886,6 +2886,31 @@ class TestFunctional(unittest.TestCase):
else:
start += dtb._fdt_obj.totalsize()
+def testFdtmapHeaderMiddle(self):
+"""Test an FDT map in the middle of an image when it should be at
end"""
+with self.assertRaises(ValueError) as e:
+self._DoReadFileRealDtb('135_fdtmap_hdr_middle.dts')
+self.assertIn("Invalid sibling order 'middle' for image-header: Must
be at 'end' to match location",
+ str(e.exception))
+
+def testFdtmapHeaderStartBad(self):
+"""Test an FDT map in middle of an image when it should be at start"""
+with self.assertRaises(ValueError) as e:
+self._DoReadFileRealDtb('136_fdtmap_hdr_startbad.dts')
+self.assertIn("Invalid sibling order 'end' for
[U-Boot] [PATCH 31/53] binman: Write the original input fdtmap to a file
When reading an image in, write its fdtmap to a file in the output
directory. This is useful for debugging. Update the 'ls' command to set up
the output directory; otherwise it will fail.
Signed-off-by: Simon Glass
---
tools/binman/control.py | 6 +-
tools/binman/image.py | 5 -
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/tools/binman/control.py b/tools/binman/control.py
index ab94f9d4829..f9680e3948d 100644
--- a/tools/binman/control.py
+++ b/tools/binman/control.py
@@ -342,7 +342,11 @@ def Binman(args):
return 0
if args.cmd == 'ls':
-ListEntries(args.image, args.paths)
+try:
+tools.PrepareOutputDir(None)
+ListEntries(args.image, args.paths)
+finally:
+tools.FinaliseOutputDir()
return 0
if args.cmd == 'extract':
diff --git a/tools/binman/image.py b/tools/binman/image.py
index c81f7e3172e..893e8cb4cd5 100644
--- a/tools/binman/image.py
+++ b/tools/binman/image.py
@@ -94,7 +94,10 @@ class Image(section.Entry_section):
data[pos + fdtmap.FDTMAP_HDR_LEN:pos + 256])
dtb_size = probe_dtb.GetFdtObj().totalsize()
fdtmap_data = data[pos:pos + dtb_size + fdtmap.FDTMAP_HDR_LEN]
-dtb = fdt.Fdt.FromData(fdtmap_data[fdtmap.FDTMAP_HDR_LEN:])
+fdt_data = fdtmap_data[fdtmap.FDTMAP_HDR_LEN:]
+out_fname = tools.GetOutputFilename('fdtmap.in.dtb')
+tools.WriteFile(out_fname, fdt_data)
+dtb = fdt.Fdt.FromData(fdt_data, out_fname)
dtb.Scan()
# Return an Image with the associated nodes
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 03/53] binman: Move GetFdtSet() into blob_dtb
At present we check the filename to see if an entry holds a device-tree
file. It is easier to use the base class designed for this purpose.
Move this method implementation into Entry_blob_dtb and update the default
one to return an empty set.
Signed-off-by: Simon Glass
---
tools/binman/entry.py | 5 -
tools/binman/etype/blob_dtb.py | 9 +
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/tools/binman/entry.py b/tools/binman/entry.py
index 1c382f3b852..276035ed324 100644
--- a/tools/binman/entry.py
+++ b/tools/binman/entry.py
@@ -192,11 +192,6 @@ class Entry(object):
Set containing the filename from this entry, if it is a .dtb, else
an empty set
"""
-fname = self.GetDefaultFilename()
-# It would be better to use isinstance(self, Entry_blob_dtb) here but
-# we cannot access Entry_blob_dtb
-if fname and fname.endswith('.dtb'):
-return set([fname])
return set()
def ExpandEntries(self):
diff --git a/tools/binman/etype/blob_dtb.py b/tools/binman/etype/blob_dtb.py
index 88ed55d8865..b242c2da38a 100644
--- a/tools/binman/etype/blob_dtb.py
+++ b/tools/binman/etype/blob_dtb.py
@@ -31,3 +31,12 @@ class Entry_blob_dtb(Entry_blob):
_, indata = state.GetFdtContents(self._filename)
data = self.CompressData(indata)
return self.ProcessContentsUpdate(data)
+
+def GetFdtSet(self):
+"""Get the set of device trees used by this entry
+
+Returns:
+Set containing the filename from this entry
+"""
+fname = self.GetDefaultFilename()
+return set([fname])
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 08/53] binman: Rename state.GetFdt()
This function name conflicts with Fdt.Node.GetFdt() which has a different
purpose. Rename it to avoid confusion.
The new name suggests it is indexed by entry type rather than filename.
This will be tidied up in a future commit.
Signed-off-by: Simon Glass
---
tools/binman/etype/u_boot_dtb_with_ucode.py | 2 +-
tools/binman/state.py | 7 ---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/tools/binman/etype/u_boot_dtb_with_ucode.py
b/tools/binman/etype/u_boot_dtb_with_ucode.py
index 18e022b..9224004efeb 100644
--- a/tools/binman/etype/u_boot_dtb_with_ucode.py
+++ b/tools/binman/etype/u_boot_dtb_with_ucode.py
@@ -54,7 +54,7 @@ class Entry_u_boot_dtb_with_ucode(Entry_blob_dtb):
# Remove the microcode
fname = self.GetDefaultFilename()
-fdt = state.GetFdt(fname)
+fdt = state.GetFdtForEtype(fname)
self.ucode = fdt.GetNode('/microcode')
if not self.ucode:
raise self.Raise("No /microcode node found in '%s'" % fname)
diff --git a/tools/binman/state.py b/tools/binman/state.py
index 77c7024f5a7..c8175a30334 100644
--- a/tools/binman/state.py
+++ b/tools/binman/state.py
@@ -33,7 +33,7 @@ main_dtb = None
# Entry.ProcessContentsUpdate()
allow_entry_expansion = True
-def GetFdt(fname):
+def GetFdtForEtype(fname):
"""Get the Fdt object for a particular device-tree filename
Binman keeps track of at least one device-tree file called u-boot.dtb but
@@ -51,7 +51,8 @@ def GetFdt(fname):
def GetFdtPath(fname):
"""Get the full pathname of a particular Fdt object
-Similar to GetFdt() but returns the pathname associated with the Fdt.
+Similar to GetFdtForEtype() but returns the pathname associated with the
+Fdt.
Args:
fname: Filename to look up (e.g. 'u-boot.dtb').
@@ -78,7 +79,7 @@ def GetFdtContents(fname='u-boot.dtb'):
"""
if fname in fdt_files and not use_fake_dtb:
pathname = GetFdtPath(fname)
-data = GetFdt(fname).GetContents()
+data = GetFdtForEtype(fname).GetContents()
else:
pathname = tools.GetInputFilename(fname)
data = tools.ReadFile(pathname)
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 16/53] dtoc: Update Fdt.FromData() to allow a name
It is confusing when something goes wrong with a device tree which was
created from data rather than a file, since there is no identifying
filename. Add an option to provide this. Use the filename as the name,
where available
Signed-off-by: Simon Glass
---
tools/dtoc/fdt.py | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/tools/dtoc/fdt.py b/tools/dtoc/fdt.py
index 3870eb1fa1b..b341ef3f83b 100644
--- a/tools/dtoc/fdt.py
+++ b/tools/dtoc/fdt.py
@@ -498,29 +498,35 @@ class Fdt:
Properties:
fname: Filename of fdt
_root: Root of device tree (a Node object)
+ name: Helpful name for this Fdt for the user (useful when creating the
+DT from data rather than a file)
"""
def __init__(self, fname):
self._fname = fname
self._cached_offsets = False
self.phandle_to_node = {}
+self.name = ''
if self._fname:
+self.name = self._fname
self._fname = fdt_util.EnsureCompiled(self._fname)
with open(self._fname, 'rb') as fd:
self._fdt_obj = libfdt.Fdt(fd.read())
@staticmethod
-def FromData(data):
+def FromData(data, name=''):
"""Create a new Fdt object from the given data
Args:
data: Device-tree data blob
+name: Helpful name for this Fdt for the user
Returns:
Fdt object containing the data
"""
fdt = Fdt(None)
fdt._fdt_obj = libfdt.Fdt(bytes(data))
+fdt.name = name
return fdt
def LookupPhandle(self, phandle):
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 11/53] binman: Simplify state.fdt_subset
At present this excludes the device tree passed in to binman since it
is always returned first by GetAllFdts(). However, this is easy to ensure
by adding a check in that function. Change this dict to includes all
device trees, and rename it to fdt_set.
Signed-off-by: Simon Glass
---
tools/binman/state.py | 21 +++--
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/tools/binman/state.py b/tools/binman/state.py
index 0278f87df22..46c1c8d613a 100644
--- a/tools/binman/state.py
+++ b/tools/binman/state.py
@@ -28,11 +28,12 @@ entry_args = {}
# ftest.py)
use_fake_dtb = False
-# Dict of device trees, keyed by entry type, but excluding the main one
+# Dict of device trees, keyed by entry type. These are the input device trees,
+# before any modification by U-Boot
# The value is as returned by Entry.GetFdts(), i.e. a tuple:
# Fdt object for this dtb, or None if not available
# Filename of file containing this dtb
-fdt_subset = {}
+fdt_set = {}
# The DTB which contains the full image information
main_dtb = None
@@ -135,7 +136,7 @@ def Prepare(images, dtb):
images: List of images being used
dtb: Main dtb
"""
-global fdt_set, fdt_subset, output_fdt_files, main_dtb
+global fdt_set, output_fdt_files, main_dtb
# Import these here in case libfdt.py is not available, in which case
# the above help option still works.
import fdt
@@ -150,13 +151,11 @@ def Prepare(images, dtb):
output_fdt_files['u-boot-dtb'] = [dtb, 'u-boot.dtb']
output_fdt_files['u-boot-spl-dtb'] = [dtb, 'spl/u-boot-spl.dtb']
output_fdt_files['u-boot-tpl-dtb'] = [dtb, 'tpl/u-boot-tpl.dtb']
-fdt_subset = {}
+fdt_set = {}
if not use_fake_dtb:
for image in images.values():
-fdt_subset.update(image.GetFdts())
-if 'u-boot-dtb' in fdt_subset:
-del fdt_subset['u-boot-dtb']
-for etype, other in fdt_subset.items():
+fdt_set.update(image.GetFdts())
+for etype, other in fdt_set.items():
_, other_fname = other
infile = tools.GetInputFilename(other_fname)
other_fname_dtb = fdt_util.EnsureCompiled(infile)
@@ -173,8 +172,10 @@ def GetAllFdts():
Device trees being used (U-Boot proper, SPL, TPL)
"""
yield main_dtb
-for etype in fdt_subset:
-yield output_fdt_files[etype][0]
+for etype in fdt_set:
+dtb = output_fdt_files[etype][0]
+if dtb != main_dtb:
+yield dtb
def GetUpdateNodes(node):
"""Yield all the nodes that need to be updated in all device trees
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 09/53] binman: Adjust GetFdt() to be keyed by etype
At present the FDTs are keyed by their default filename (not their actual
filename). It seems easier to key by the entry type, since this is always
the same for each FDT type.
To do this, add a new Entry method called GetFdtEtype(). This is necessary
since some entry types contain a device tree which are not the simple
three entry types 'u-boot-dtb', 'u-boot-spl' or 'u-boot-tpl'.
The code already returns a dict for GetFdt(). Update the value of that
dict to include the filename so that existing code can work.
Signed-off-by: Simon Glass
---
tools/binman/entry.py | 4 +++-
tools/binman/entry_test.py | 9 +
tools/binman/etype/blob_dtb.py | 16 ++--
tools/binman/etype/u_boot_dtb.py| 3 +++
tools/binman/etype/u_boot_dtb_with_ucode.py | 3 +++
tools/binman/etype/u_boot_spl_dtb.py| 3 +++
tools/binman/etype/u_boot_tpl_dtb.py| 3 +++
tools/binman/etype/u_boot_tpl_dtb_with_ucode.py | 3 +++
tools/binman/state.py | 14 +-
9 files changed, 50 insertions(+), 8 deletions(-)
diff --git a/tools/binman/entry.py b/tools/binman/entry.py
index 2ed9dc0d6f4..dd2daadf16f 100644
--- a/tools/binman/entry.py
+++ b/tools/binman/entry.py
@@ -192,7 +192,9 @@ class Entry(object):
Empty dict, if this entry is not a .dtb, otherwise:
Dict:
key: Filename from this entry (without the path)
-value: Fdt object for this dtb, or None if not available
+value: Tuple:
+Fdt object for this dtb, or None if not available
+Filename of file containing this dtb
"""
return {}
diff --git a/tools/binman/entry_test.py b/tools/binman/entry_test.py
index b6ad3edb8dc..460171ba899 100644
--- a/tools/binman/entry_test.py
+++ b/tools/binman/entry_test.py
@@ -84,5 +84,14 @@ class TestEntry(unittest.TestCase):
base_entry = entry.Entry(None, None, None, read_node=False)
self.assertIsNone(base_entry.GetDefaultFilename())
+def testBlobFdt(self):
+"""Test the GetFdtEtype() method of the blob-dtb entries"""
+base = entry.Entry.Create(None, self.GetNode(), 'blob-dtb')
+self.assertIsNone(base.GetFdtEtype())
+
+dtb = entry.Entry.Create(None, self.GetNode(), 'u-boot-dtb')
+self.assertEqual('u-boot-dtb', dtb.GetFdtEtype())
+
+
if __name__ == "__main__":
unittest.main()
diff --git a/tools/binman/etype/blob_dtb.py b/tools/binman/etype/blob_dtb.py
index b70c3d3a3a2..b9ccf9a9540 100644
--- a/tools/binman/etype/blob_dtb.py
+++ b/tools/binman/etype/blob_dtb.py
@@ -32,12 +32,24 @@ class Entry_blob_dtb(Entry_blob):
data = self.CompressData(indata)
return self.ProcessContentsUpdate(data)
+def GetFdtEtype(self):
+"""Get the entry type of this device tree
+
+This can be 'u-boot-dtb', 'u-boot-spl-dtb' or 'u-boot-tpl-dtb'
+Returns:
+Entry type if any, e.g. 'u-boot-dtb'
+"""
+return None
+
def GetFdts(self):
"""Get the device trees used by this entry
Returns:
Dict:
key: Filename from this entry (without the path)
-value: Fdt object for this dtb, or None if not available
+value: Tuple:
+Fdt object for this dtb, or None if not available
+Filename of file containing this dtb
"""
-return {self.GetDefaultFilename(): None}
+fname = self.GetDefaultFilename()
+return {self.GetFdtEtype(): [self, fname]}
diff --git a/tools/binman/etype/u_boot_dtb.py b/tools/binman/etype/u_boot_dtb.py
index 6263c4ebee3..6c805a666da 100644
--- a/tools/binman/etype/u_boot_dtb.py
+++ b/tools/binman/etype/u_boot_dtb.py
@@ -26,3 +26,6 @@ class Entry_u_boot_dtb(Entry_blob_dtb):
def GetDefaultFilename(self):
return 'u-boot.dtb'
+
+def GetFdtEtype(self):
+return 'u-boot-dtb'
diff --git a/tools/binman/etype/u_boot_dtb_with_ucode.py
b/tools/binman/etype/u_boot_dtb_with_ucode.py
index 9224004efeb..ff7f80421a3 100644
--- a/tools/binman/etype/u_boot_dtb_with_ucode.py
+++ b/tools/binman/etype/u_boot_dtb_with_ucode.py
@@ -36,6 +36,9 @@ class Entry_u_boot_dtb_with_ucode(Entry_blob_dtb):
def GetDefaultFilename(self):
return 'u-boot.dtb'
+def GetFdtEtype(self):
+return 'u-boot-dtb'
+
def ProcessFdt(self, fdt):
# So the module can be loaded without it
import fdt
diff --git a/tools/binman/etype/u_boot_spl_dtb.py
b/tools/binman/etype/u_boot_spl_dtb.py
index e7354646f13..1bcd449bf3a 100644
--- a/tools/binman/etype/u_boot_spl_dtb.py
+++ b/tools/binman/etype/u_boot_spl_dtb.py
@@ -23,3 +23,6 @@ class Entry_u_boot_spl_dtb(Entry_blob_dtb):
def GetDefaultFilename(self):
return 'spl/u-boot-spl.dtb'
+
+def GetFdtEtype(self):
+
[U-Boot] [PATCH 02/53] binman: Move image-processing code into a function
The Binman() function is very long. Split out the image code to make it
more manageable.
Signed-off-by: Simon Glass
---
tools/binman/control.py | 103 ++--
1 file changed, 57 insertions(+), 46 deletions(-)
diff --git a/tools/binman/control.py b/tools/binman/control.py
index dc898be6179..a92056846d0 100644
--- a/tools/binman/control.py
+++ b/tools/binman/control.py
@@ -169,6 +169,62 @@ def ExtractEntries(image_fname, output_fname, outdir,
entry_paths,
return einfos
+def ProcessImage(image, update_fdt, write_map):
+"""Perform all steps for this image, including checking and # writing it.
+
+This means that errors found with a later image will be reported after
+earlier images are already completed and written, but that does not seem
+important.
+
+Args:
+image: Image to process
+update_fdt: True to update the FDT wth entry offsets, etc.
+write_map: True to write a map file
+"""
+image.GetEntryContents()
+image.GetEntryOffsets()
+
+# We need to pack the entries to figure out where everything
+# should be placed. This sets the offset/size of each entry.
+# However, after packing we call ProcessEntryContents() which
+# may result in an entry changing size. In that case we need to
+# do another pass. Since the device tree often contains the
+# final offset/size information we try to make space for this in
+# AddMissingProperties() above. However, if the device is
+# compressed we cannot know this compressed size in advance,
+# since changing an offset from 0x100 to 0x104 (for example) can
+# alter the compressed size of the device tree. So we need a
+# third pass for this.
+passes = 3
+for pack_pass in range(passes):
+try:
+image.PackEntries()
+image.CheckSize()
+image.CheckEntries()
+except Exception as e:
+if write_map:
+fname = image.WriteMap()
+print("Wrote map file '%s' to show errors" % fname)
+raise
+image.SetImagePos()
+if update_fdt:
+image.SetCalculatedProperties()
+for dtb_item in state.GetFdts():
+dtb_item.Sync()
+sizes_ok = image.ProcessEntryContents()
+if sizes_ok:
+break
+image.ResetForPack()
+if not sizes_ok:
+image.Raise('Entries expanded after packing (tried %s passes)' %
+passes)
+
+image.WriteSymbols()
+image.BuildImage()
+if write_map:
+image.WriteMap()
+
+
def Binman(args):
"""The main control code for binman
@@ -279,52 +335,7 @@ def Binman(args):
dtb_item.Flush()
for image in images.values():
-# Perform all steps for this image, including checking and
-# writing it. This means that errors found with a later
-# image will be reported after earlier images are already
-# completed and written, but that does not seem important.
-image.GetEntryContents()
-image.GetEntryOffsets()
-
-# We need to pack the entries to figure out where everything
-# should be placed. This sets the offset/size of each entry.
-# However, after packing we call ProcessEntryContents() which
-# may result in an entry changing size. In that case we need to
-# do another pass. Since the device tree often contains the
-# final offset/size information we try to make space for this
in
-# AddMissingProperties() above. However, if the device is
-# compressed we cannot know this compressed size in advance,
-# since changing an offset from 0x100 to 0x104 (for example)
can
-# alter the compressed size of the device tree. So we need a
-# third pass for this.
-passes = 3
-for pack_pass in range(passes):
-try:
-image.PackEntries()
-image.CheckSize()
-image.CheckEntries()
-except Exception as e:
-if args.map:
-fname = image.WriteMap()
-print("Wrote map file '%s' to show errors" %
fname)
-raise
-image.SetImagePos()
-if args.update_fdt:
-image.SetCalculatedProperties()
-for dtb_item in state.GetFdts():
-dtb_item.Sync()
-sizes_ok = image.ProcessEntryContents()
-if sizes_ok:
-break
-image.ResetForPack()
-if not sizes_ok:
-image.Raise('Entries
[U-Boot] [PATCH 15/53] binman: Show a helpful error when a DT property is missing
At present a Python exception is raised which does not show the node
information. Add a more helpful exception in this case.
Signed-off-by: Simon Glass
---
tools/dtoc/fdt.py | 23 ---
tools/dtoc/test_fdt.py | 21 +
2 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/tools/dtoc/fdt.py b/tools/dtoc/fdt.py
index d9471c43819..3870eb1fa1b 100644
--- a/tools/dtoc/fdt.py
+++ b/tools/dtoc/fdt.py
@@ -362,6 +362,23 @@ class Node:
value = tools.GetBytes(0, len)
self.props[prop_name] = Prop(self, None, prop_name, value)
+def _CheckProp(self, prop_name):
+"""Check if a property is present
+
+Args:
+prop_name: Name of property
+
+Returns:
+self
+
+Raises:
+ValueError if the property is missing
+"""
+if prop_name not in self.props:
+raise ValueError("Fdt '%s', node '%s': Missing property '%s'" %
+ (self._fdt._fname, self.path, prop_name))
+return self
+
def SetInt(self, prop_name, val):
"""Update an integer property int the device tree.
@@ -374,7 +391,7 @@ class Node:
prop_name: Name of property
val: Value to set
"""
-self.props[prop_name].SetInt(val)
+self._CheckProp(prop_name).props[prop_name].SetInt(val)
def SetData(self, prop_name, val):
"""Set the data value of a property
@@ -386,7 +403,7 @@ class Node:
prop_name: Name of property to set
val: Data value to set
"""
-self.props[prop_name].SetData(val)
+self._CheckProp(prop_name).props[prop_name].SetData(val)
def SetString(self, prop_name, val):
"""Set the string value of a property
@@ -400,7 +417,7 @@ class Node:
"""
if sys.version_info[0] >= 3: # pragma: no cover
val = bytes(val, 'utf-8')
-self.props[prop_name].SetData(val + b'\0')
+self._CheckProp(prop_name).props[prop_name].SetData(val + b'\0')
def AddString(self, prop_name, val):
"""Add a new string property to a node
diff --git a/tools/dtoc/test_fdt.py b/tools/dtoc/test_fdt.py
index bf469dbd54c..c25248ca1f9 100755
--- a/tools/dtoc/test_fdt.py
+++ b/tools/dtoc/test_fdt.py
@@ -421,6 +421,27 @@ class TestProp(unittest.TestCase):
self.dtb.Sync(auto_resize=True)
self.assertTrue(dtb2.GetContents() != self.dtb.GetContents())
+def testMissingSetInt(self):
+"""Test handling of a missing property with SetInt"""
+with self.assertRaises(ValueError) as e:
+self.node.SetInt('one', 1)
+self.assertIn("node '/spl-test': Missing property 'one'",
+ str(e.exception))
+
+def testMissingSetData(self):
+"""Test handling of a missing property with SetData"""
+with self.assertRaises(ValueError) as e:
+self.node.SetData('one', b'data')
+self.assertIn("node '/spl-test': Missing property 'one'",
+ str(e.exception))
+
+def testMissingSetString(self):
+"""Test handling of a missing property with SetString"""
+with self.assertRaises(ValueError) as e:
+self.node.SetString('one', 1)
+self.assertIn("node '/spl-test': Missing property 'one'",
+ str(e.exception))
+
class TestFdtUtil(unittest.TestCase):
"""Tests for the fdt_util module
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 10/53] binman: Adjust state.fdt_files to be keyed by entry type
It makes more sense to use entry type as the key for this dictionary,
since the filename can in principle be anything. Make this change and also
rename fdt_files and add a comment to explain it better.
Signed-off-by: Simon Glass
---
tools/binman/etype/blob_dtb.py | 4 +-
tools/binman/etype/u_boot_dtb_with_ucode.py | 6 +--
tools/binman/state.py | 57 -
3 files changed, 38 insertions(+), 29 deletions(-)
diff --git a/tools/binman/etype/blob_dtb.py b/tools/binman/etype/blob_dtb.py
index b9ccf9a9540..a3b548eef20 100644
--- a/tools/binman/etype/blob_dtb.py
+++ b/tools/binman/etype/blob_dtb.py
@@ -23,12 +23,12 @@ class Entry_blob_dtb(Entry_blob):
def ObtainContents(self):
"""Get the device-tree from the list held by the 'state' module"""
self._filename = self.GetDefaultFilename()
-self._pathname, _ = state.GetFdtContents(self._filename)
+self._pathname, _ = state.GetFdtContents(self.GetFdtEtype())
return Entry_blob.ReadBlobContents(self)
def ProcessContents(self):
"""Re-read the DTB contents so that we get any calculated properties"""
-_, indata = state.GetFdtContents(self._filename)
+_, indata = state.GetFdtContents(self.GetFdtEtype())
data = self.CompressData(indata)
return self.ProcessContentsUpdate(data)
diff --git a/tools/binman/etype/u_boot_dtb_with_ucode.py
b/tools/binman/etype/u_boot_dtb_with_ucode.py
index ff7f80421a3..cb6c3730d79 100644
--- a/tools/binman/etype/u_boot_dtb_with_ucode.py
+++ b/tools/binman/etype/u_boot_dtb_with_ucode.py
@@ -56,11 +56,11 @@ class Entry_u_boot_dtb_with_ucode(Entry_blob_dtb):
return True
# Remove the microcode
-fname = self.GetDefaultFilename()
-fdt = state.GetFdtForEtype(fname)
+etype = self.GetFdtEtype()
+fdt = state.GetFdtForEtype(etype)
self.ucode = fdt.GetNode('/microcode')
if not self.ucode:
-raise self.Raise("No /microcode node found in '%s'" % fname)
+raise self.Raise("No /microcode node found in '%s'" % etype)
# There's no need to collate it (move all microcode into one place)
# if we only have one chunk of microcode.
diff --git a/tools/binman/state.py b/tools/binman/state.py
index ee11ba470e0..0278f87df22 100644
--- a/tools/binman/state.py
+++ b/tools/binman/state.py
@@ -11,9 +11,15 @@ import re
import os
import tools
-# Records the device-tree files known to binman, keyed by filename (e.g.
-# 'u-boot-spl.dtb')
-fdt_files = {}
+# Records the device-tree files known to binman, keyed by entry type (e.g.
+# 'u-boot-spl-dtb'). These are the output FDT files, which can be updated by
+# binman. They have been copied to .out files.
+#
+# key: entry type
+# value: tuple:
+# Fdt object
+# Filename
+output_fdt_files = {}
# Arguments passed to binman to provide arguments to entries
entry_args = {}
@@ -36,36 +42,36 @@ main_dtb = None
# Entry.ProcessContentsUpdate()
allow_entry_expansion = True
-def GetFdtForEtype(fname):
-"""Get the Fdt object for a particular device-tree filename
+def GetFdtForEtype(etype):
+"""Get the Fdt object for a particular device-tree entry
Binman keeps track of at least one device-tree file called u-boot.dtb but
can also have others (e.g. for SPL). This function looks up the given
-filename and returns the associated Fdt object.
+entry and returns the associated Fdt object.
Args:
-fname: Filename to look up (e.g. 'u-boot.dtb').
+etype: Entry type of device tree (e.g. 'u-boot-dtb')
Returns:
-Fdt object associated with the filename
+Fdt object associated with the entry type
"""
-return fdt_files[fname]
+return output_fdt_files[etype][0]
-def GetFdtPath(fname):
+def GetFdtPath(etype):
"""Get the full pathname of a particular Fdt object
Similar to GetFdtForEtype() but returns the pathname associated with the
Fdt.
Args:
-fname: Filename to look up (e.g. 'u-boot.dtb').
+etype: Entry type of device tree (e.g. 'u-boot-dtb')
Returns:
Full path name to the associated Fdt
"""
-return fdt_files[fname]._fname
+return output_fdt_files[etype][0]._fname
-def GetFdtContents(fname='u-boot.dtb'):
+def GetFdtContents(etype='u-boot-dtb'):
"""Looks up the FDT pathname and contents
This is used to obtain the Fdt pathname and contents when needed by an
@@ -73,17 +79,18 @@ def GetFdtContents(fname='u-boot.dtb'):
the real dtb.
Args:
-fname: Filename to look up (e.g. 'u-boot.dtb').
+etype: Entry type to look up (e.g. 'u-boot.dtb').
Returns:
tuple:
pathname to Fdt
Fdt data (as bytes)
"""
-if fname in fdt_files and not use_fake_dtb:
-pathname = GetFdtPath(fname)
-data = GetFdtForEtype(fname).GetContents()
+if
[U-Boot] [PATCH 20/53] binman: Allow state functions to fail to return data
At present these state functions raise an exception if they cannot find what is requested. But in some cases the information is optional (e.g. an fdtmap in a coming patch) so it is better to return gracefully. Update these two functions to return None when the data cannot be found. Signed-off-by: Simon Glass --- tools/binman/state.py | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/binman/state.py b/tools/binman/state.py index 7c3a987723e..87674100665 100644 --- a/tools/binman/state.py +++ b/tools/binman/state.py @@ -49,7 +49,10 @@ def GetFdtForEtype(etype): Returns: Fdt object associated with the entry type """ -return output_fdt_files[etype][0] +value = output_fdt_files.get(etype); +if not value: +return None +return value[0] def GetFdtPath(etype): """Get the full pathname of a particular Fdt object @@ -80,7 +83,9 @@ def GetFdtContents(etype='u-boot-dtb'): pathname to Fdt Fdt data (as bytes) """ -if etype in output_fdt_files and not use_fake_dtb: +if etype not in output_fdt_files: +return None, None +if not use_fake_dtb: pathname = GetFdtPath(etype) data = GetFdtForEtype(etype).GetContents() else: -- 2.22.0.657.g960e92d24f-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 14/53] binman: Add a bit of logging in entries when packing
Use the new logging feature to log information about progress with
packing. This is useful to see how binman is figuring things out.
Also update elf.py to use the same feature.
Signed-off-by: Simon Glass
---
tools/binman/elf.py | 9 +++--
tools/binman/elf_test.py | 19 +++
tools/binman/entry.py | 20 ++--
tools/binman/etype/fdtmap.py | 3 +++
tools/binman/etype/section.py | 2 ++
tools/patman/tools.py | 16
6 files changed, 53 insertions(+), 16 deletions(-)
diff --git a/tools/binman/elf.py b/tools/binman/elf.py
index 8147b3437dd..af40024ceab 100644
--- a/tools/binman/elf.py
+++ b/tools/binman/elf.py
@@ -17,6 +17,7 @@ import struct
import tempfile
import tools
+import tout
ELF_TOOLS = True
try:
@@ -25,9 +26,6 @@ try:
except: # pragma: no cover
ELF_TOOLS = False
-# This is enabled from control.py
-debug = False
-
Symbol = namedtuple('Symbol', ['section', 'address', 'size', 'weak'])
# Information about an ELF file:
@@ -143,9 +141,8 @@ def LookupAndWriteSymbols(elf_fname, entry, section):
value = -1
pack_string = pack_string.lower()
value_bytes = struct.pack(pack_string, value)
-if debug:
-print('%s:\n insert %s, offset %x, value %x, length %d' %
- (msg, name, offset, value, len(value_bytes)))
+tout.Debug('%s:\n insert %s, offset %x, value %x, length %d' %
+ (msg, name, offset, value, len(value_bytes)))
entry.data = (entry.data[:offset] + value_bytes +
entry.data[offset + sym.size:])
diff --git a/tools/binman/elf_test.py b/tools/binman/elf_test.py
index e2506377f26..416e43baf0e 100644
--- a/tools/binman/elf_test.py
+++ b/tools/binman/elf_test.py
@@ -14,6 +14,7 @@ import command
import elf
import test_util
import tools
+import tout
binman_dir = os.path.dirname(os.path.realpath(sys.argv[0]))
@@ -130,14 +131,16 @@ class TestElf(unittest.TestCase):
def testDebug(self):
"""Check that enabling debug in the elf module produced debug output"""
-elf.debug = True
-entry = FakeEntry(20)
-section = FakeSection()
-elf_fname = os.path.join(binman_dir, 'test', 'u_boot_binman_syms')
-with test_util.capture_sys_output() as (stdout, stderr):
-syms = elf.LookupAndWriteSymbols(elf_fname, entry, section)
-elf.debug = False
-self.assertTrue(len(stdout.getvalue()) > 0)
+try:
+tout.Init(tout.DEBUG)
+entry = FakeEntry(20)
+section = FakeSection()
+elf_fname = os.path.join(binman_dir, 'test', 'u_boot_binman_syms')
+with test_util.capture_sys_output() as (stdout, stderr):
+syms = elf.LookupAndWriteSymbols(elf_fname, entry, section)
+self.assertTrue(len(stdout.getvalue()) > 0)
+finally:
+tout.Init(tout.WARNING)
def testMakeElf(self):
"""Test for the MakeElf function"""
diff --git a/tools/binman/entry.py b/tools/binman/entry.py
index dd2daadf16f..e3c64348225 100644
--- a/tools/binman/entry.py
+++ b/tools/binman/entry.py
@@ -23,6 +23,7 @@ import sys
import fdt_util
import state
import tools
+from tools import ToHex, ToHexSize
import tout
modules = {}
@@ -272,8 +273,9 @@ class Entry(object):
new_size = len(data)
if state.AllowEntryExpansion():
if new_size > self.contents_size:
-tout.Debug("Entry '%s' size change from %#x to %#x" % (
-self._node.path, self.contents_size, new_size))
+tout.Debug("Entry '%s' size change from %s to %s" % (
+self._node.path, ToHex(self.contents_size),
+ToHex(new_size)))
# self.data will indicate the new size needed
size_ok = False
elif new_size != self.contents_size:
@@ -294,6 +296,9 @@ class Entry(object):
def ResetForPack(self):
"""Reset offset/size fields so that packing can be done again"""
+self.Detail('ResetForPack: offset %s->%s, size %s->%s' %
+(ToHex(self.offset), ToHex(self.orig_offset),
+ ToHex(self.size), ToHex(self.orig_size)))
self.offset = self.orig_offset
self.size = self.orig_size
@@ -315,6 +320,9 @@ class Entry(object):
Returns:
New section offset pointer (after this entry)
"""
+self.Detail('Packing: offset=%s, size=%s, content_size=%x' %
+(ToHex(self.offset), ToHex(self.size),
+ self.contents_size))
if self.offset is None:
if self.offset_unset:
self.Raise('No offset set with offset-unset: should another '
@@ -346,6 +354,8 @@ class Entry(object):
if self.offset != tools.Align(self.offset, self.align):
[U-Boot] [PATCH 01/53] dtoc: Return a non-zero exit code when tests fail
At present 'dtoc -t' return a success code even if some of the tests fail.
Fix this by checking the test result and setting the exit code. This
allows 'make qcheck' to function as expected.
Signed-off-by: Simon Glass
---
tools/dtoc/dtoc.py | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/tools/dtoc/dtoc.py b/tools/dtoc/dtoc.py
index c1a1d3534d4..514e0dd4a34 100755
--- a/tools/dtoc/dtoc.py
+++ b/tools/dtoc/dtoc.py
@@ -71,6 +71,10 @@ def run_tests(args):
print(err)
for _, err in result.failures:
print(err)
+if result.errors or result.failures:
+print('dtoc tests FAILED')
+return 1
+return 0
def RunTestCoverage():
"""Run the tests and check that we get 100% coverage"""
@@ -101,7 +105,8 @@ parser.add_option('-T', '--test-coverage',
action='store_true',
# Run our meagre tests
if options.test:
-run_tests(args)
+ret_code = run_tests(args)
+sys.exit(ret_code)
elif options.test_coverage:
RunTestCoverage()
--
2.22.0.657.g960e92d24f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 00/53] binman: Support replacing entries in an existing image
At present binman allows existing images to be listed, so long as they have an fdtmap entry inside them. This series extends that to permit changing the contents of an existing image, by replacing the contents of entries with other files or directories. It is not possible to add new entries. This feature works by reading in the original data, repacking the image if necessary (e.g. an entry size has changed) and writing it back out. This series includes quite a few clean-ups and refactoring to improve the code a little. Simon Glass (53): dtoc: Return a non-zero exit code when tests fail binman: Move image-processing code into a function binman: Move GetFdtSet() into blob_dtb binman: Use print() to print output binman: Move image/fdt code into PrepareImagesAndDtbs() binman: Convert GetFdtSet() to use a dict binman: Rename state.GetFdts() binman: Rename state.GetFdt() binman: Adjust GetFdt() to be keyed by etype binman: Adjust state.fdt_files to be keyed by entry type binman: Simplify state.fdt_subset binman: Drop state.fdt_set as this is not needed patman: Update tout to avoid open-coding the debug levels binman: Add a bit of logging in entries when packing binman: Show a helpful error when a DT property is missing dtoc: Update Fdt.FromData() to allow a name dtoc: Update Fdt.GetNode() to handle the root node binman: Store image fdtmap when loading from a file binman: Support loading entry data from a file binman: Allow state functions to fail to return data binman: Store the entry in output_fdt_files binman: Add an image name into the fdtmap binman: Adjust Entry to read the node in a separate call binman: Add a function to obtain the image for an Entry binman: Add a constant for common entry properties binman: Allow the fdtmap to remain unchanged binman: Tidy up _SetupDtb() to use its own temporary file binman: Support updating entries in an existing image binman: Add info to allow safely repacking an image later binman: Update documentation for image creation binman: Write the original input fdtmap to a file binman: Move Image.BuildImage() into a single function binman: Add more tests for image header position binman: Allow updating entries that change size binman: Update the _testing entry to support shrinkage binman: Support shrinking a entry after packing libfdt: Copy the struct region in fdt_resize() binman: Adjust fmap to ignore CBFS files binman: Place Intel descriptor at image start binman: Add a few more features to the wishlist binman: Add a prefix before CBFS hex offsets binman: Update Entry.ReadEntry() to work through classes binman: Update Entry.WriteData() to handle special sections binman: Support replacing data in a cbfs patman: Reset the output directory when it is removed binman: Update state when replacing device-tree entries binman: Add a test function to clean up the output dir binman: Clean up all output directories in tests binman: Move control.WriteEntry further down the file binman: Update control.WriteEntry() to support writing the map binman: Split control.WriteEntryToImage() into separate functions binman: Correct the error message for invalid path binman: Add command-line support for replacing entries scripts/dtc/libfdt/fdt_sw.c | 2 +- tools/binman/README | 79 ++- tools/binman/README.entries | 11 +- tools/binman/cbfs_util.py | 14 +- tools/binman/cbfs_util_test.py| 4 +- tools/binman/cmdline.py | 17 + tools/binman/control.py | 408 tools/binman/elf.py | 9 +- tools/binman/elf_test.py | 19 +- tools/binman/entry.py | 162 - tools/binman/entry_test.py| 22 +- tools/binman/etype/_testing.py| 28 +- tools/binman/etype/blob.py| 12 - tools/binman/etype/blob_dtb.py| 35 +- tools/binman/etype/cbfs.py| 24 +- tools/binman/etype/fdtmap.py | 60 +- tools/binman/etype/fill.py| 3 + tools/binman/etype/fmap.py| 11 +- tools/binman/etype/image_header.py| 16 +- tools/binman/etype/intel_descriptor.py| 6 +- tools/binman/etype/intel_ifwi.py | 1 + tools/binman/etype/section.py | 105 +++- tools/binman/etype/u_boot_dtb.py | 3 + tools/binman/etype/u_boot_dtb_with_ucode.py | 9 +- tools/binman/etype/u_boot_spl_dtb.py | 3 + tools/binman/etype/u_boot_tpl_dtb.py | 3 + .../binman/etype/u_boot_tpl_dtb_with_ucode.py | 3 + tools/binman/ftest.py | 589 -- tools/binman/image.py | 52 +- tools/binman/state.py | 207
[U-Boot] zynq_z_turn_defconfig: no info from SPL
Hello, I am trying to build u-boot v2019.07 with zynq_z_turn_defconfig config. I obtain spl/boot.bin file that is placed at the first FAT partition as required by BootROM docs. I also put u-boot.img and u-boot.bin at the same partition. However, when I powered the board, nothing happening at all. I've checked that when I replace boot.bin with a binary provided on the vendor CD disk, the BootROM is able to find and run vendor bootloader. I even don't see SPL banner when try to rebuild u-boot myself even CONFIG_DEBUG_UART is enabled in the config. How could I figure out what is happening? ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 1/1] efi_loader: remove efi_exit_caches()
On 7/20/19 12:22 PM, Peter Robinson wrote: >> On 7/19/19 9:06 PM, Peter Robinson wrote: >>> On Fri, Jul 19, 2019 at 7:28 PM Heinrich Schuchardt >>> wrote: In GRUB before 2.04 a bug existed which did not allow booting some ARM32 boards if U-Boot did not disable caches, cf. https://lists.linaro.org/pipermail/cross-distro/2019-July/000933.html In ExitBootServices() we were disabling the caches by calling cleanup_before_linux(). This workaround is not needed anymore. >>> >>> Do we want to remove this straight away? A lot of distributions will >>> take time to move to grub 2.04 because it's been a long time between >>> grub releases so they'll have quite a patch delta to re-align to the >>> new release. Fedora for example will rebase to grub 2.04 in Fedora 32 >>> which will start development end of August but won't be released until >>> next year. >> >> As described below this code does not remove any functionality that was >> active in U-Boot v2019.04 or v2019.07. >> >> I can see nothing in https://fedoraproject.org/wiki/Updates_Policy >> stopping GRUB 2.04 from being made available for stable Fedora releases. > > The maintainers believe that it's too intrusive to land now and they > want maximum testing time before it gets to stable users, funnily > enough people don't like it when their machines cease to boot. Why should anybody's machines cease to boot? If Fedora does not role out a new U-Boot they are fine. If Fedora roles out a new U-Boot they should role out a matching GRUB and they are fine too. The venturous who build their own U-Boot should know how to role back their system if needed. Best regards Heinrich ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2 05/12] armV7R: K3: am654: Allow using SPL BSS pre-relocation
On Fri, Jul 19, 2019 at 07:29:37AM +0200, Simon Goldschmidt wrote: > On Fri, Jul 19, 2019 at 2:29 AM Tom Rini wrote: > > > > On Tue, Jun 04, 2019 at 05:55:48PM -0500, Andreas Dannenberg wrote: > > > > > In order to be able to use more advanced driver functionality which often > > > relies on having BSS initialized during early boot prior to relocation > > > several things need to be in place: > > > > > > 1) Memory needs to be available for BSS to use. For this, we locate BSS > > >at the top of the MCU SRAM area, with the stack starting right below > > >it, > > > 2) We need to move the initialization of BSS prior to entering > > >board_init_f(). We will do this with a separate commit by turning on > > >the respective CONFIG option. > > > > > > In this commit we also clean up the assignment of the initial SP address > > > as part of the refactoring, taking into account the pre-decrement post- > > > increment nature in which the SP is used on ARM. > > > > > > Signed-off-by: Andreas Dannenberg > > > > Applied to u-boot/master, thanks! > > Wait, why has this been merged? Unfortunately, I haven't followed this series, > but in a discussion about a similar patch I sent [1], using BSS from > board_init_f > was turned down. And Simon Glass rather convinced me that this is the current > API U-Boot has (and is documented in README). > > So either we must change this API and its documentation (and I would expect > the > author of this patch to combine the README change with the code change), or > this > patch would have to be rejected. > > Again, I'm sorry I only see this now. In thought to remember a > discussion in this > thread, but I clearly remember that wrong... > > [1] https://patchwork.ozlabs.org/patch/1057237/ And I had missed that other thread. Lokesh, since I think Andreas is out currently can you expand a little on what we can/can't do on this platform? Thanks! -- Tom signature.asc Description: PGP signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 1/1] efi_loader: remove efi_exit_caches()
On 7/20/19 1:59 AM, Jonathan Gray wrote: > On Fri, Jul 19, 2019 at 08:25:45PM +0200, Heinrich Schuchardt wrote: >> In GRUB before 2.04 a bug existed which did not allow booting some ARM32 >> boards if U-Boot did not disable caches, cf. >> https://lists.linaro.org/pipermail/cross-distro/2019-July/000933.html >> >> In ExitBootServices() we were disabling the caches by calling >> cleanup_before_linux(). This workaround is not needed anymore. > > It is required for at least OpenBSD, FreeBSD and NetBSD. > Which are all now forced to carry patches to be able to use U-Boot. Please, compare function run_loadfile() in files sys/arch/arm64/stand/efiboot/exec.c and sys/arch/armv7/stand/efiboot/exec.c of openbsd/src. On arm64 after loading the kernel you flush the data and instruction caches. On armv7 you don't. As the UEFI spec requires caches to be switched on this is bound to fail. You should be good if you flush caches like you do on arm64. You can find the relevant code for GRUB in grub-core/kern/arm/cache.S and grub-core/kern/arm/cache.c After GRUB loads the Linux kernel it calls grub_arch_sync_caches ((void *) linux_addr, linux_size); in function linux_boot(). FreeBSD simply calls LoadImage() and StartImage() when booting and leaves the cleanup of caches to the firmware (i.e. EDK2 or U-Boot). https://github.com/freebsd/freebsd/blob/master/stand/efi/boot1/boot1.c#L133 Best regards Heinrich ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 1/1] efi_loader: remove efi_exit_caches()
> On 7/19/19 9:06 PM, Peter Robinson wrote:
> > On Fri, Jul 19, 2019 at 7:28 PM Heinrich Schuchardt
> > wrote:
> >>
> >> In GRUB before 2.04 a bug existed which did not allow booting some ARM32
> >> boards if U-Boot did not disable caches, cf.
> >> https://lists.linaro.org/pipermail/cross-distro/2019-July/000933.html
> >>
> >> In ExitBootServices() we were disabling the caches by calling
> >> cleanup_before_linux(). This workaround is not needed anymore.
> >
> > Do we want to remove this straight away? A lot of distributions will
> > take time to move to grub 2.04 because it's been a long time between
> > grub releases so they'll have quite a patch delta to re-align to the
> > new release. Fedora for example will rebase to grub 2.04 in Fedora 32
> > which will start development end of August but won't be released until
> > next year.
>
> As described below this code does not remove any functionality that was
> active in U-Boot v2019.04 or v2019.07.
>
> I can see nothing in https://fedoraproject.org/wiki/Updates_Policy
> stopping GRUB 2.04 from being made available for stable Fedora releases.
The maintainers believe that it's too intrusive to land now and they
want maximum testing time before it gets to stable users, funnily
enough people don't like it when their machines cease to boot.
> >> The UEFI spec requires that caches are enabled but architecturally defined
> >> caches should be disabled. But this requirement has to be fulfilled when
> >> invoking StartImage() and not after calling ExitBootServices(). So there is
> >> no reason for calling cleanup_before_linux() here.
> >>
> >> Since commit f69d63fae281 ("efi_loader: use efi_start_image() for
> >> bootefi"), i.e. v2019.04, we have not been calling efi_exit_caches()
> >> anymore which in turn would call cleanup_before_linux().
> >>
> >> Remove the obsolete function efi_exit_caches().
> >>
> >> Suggested-by: Alexander Graf
> >> Signed-off-by: Heinrich Schuchardt
> >> ---
> >> lib/efi_loader/efi_boottime.c | 28
> >> 1 file changed, 28 deletions(-)
> >>
> >> diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
> >> index 4f6e8d1679..f84ee24416 100644
> >> --- a/lib/efi_loader/efi_boottime.c
> >> +++ b/lib/efi_loader/efi_boottime.c
> >> @@ -39,14 +39,6 @@ LIST_HEAD(efi_register_notify_events);
> >> /* Handle of the currently executing image */
> >> static efi_handle_t current_image;
> >>
> >> -/*
> >> - * If we're running on nasty systems (32bit ARM booting into non-EFI
> >> Linux)
> >> - * we need to do trickery with caches. Since we don't want to break the
> >> EFI
> >> - * aware boot path, only apply hacks when loading exiting directly
> >> (breaking
> >> - * direct Linux EFI booting along the way - oh well).
> >> - */
> >> -static bool efi_is_direct_boot = true;
> >> -
> >> #ifdef CONFIG_ARM
> >> /*
> >> * The "gd" pointer lives in a register on ARM and AArch64 that we declare
> >> @@ -1906,21 +1898,6 @@ error:
> >> return EFI_EXIT(ret);
> >> }
> >>
> >> -/**
> >> - * efi_exit_caches() - fix up caches for EFI payloads if necessary
> >> - */
> >> -static void efi_exit_caches(void)
> >> -{
> >> -#if defined(CONFIG_ARM) && !defined(CONFIG_ARM64)
> >> - /*
> >> -* Grub on 32bit ARM needs to have caches disabled before jumping
> >> into
> >> -* a zImage, but does not know of all cache layers. Give it a hand.
> >> -*/
> >> - if (efi_is_direct_boot)
> >> - cleanup_before_linux();
> >> -#endif
> >> -}
> >> -
> >> /**
> >> * efi_exit_boot_services() - stop all boot services
> >> * @image_handle: handle of the loaded image
> >> @@ -1990,9 +1967,6 @@ static efi_status_t EFIAPI
> >> efi_exit_boot_services(efi_handle_t image_handle,
> >> /* Patch out unsupported runtime function */
> >> efi_runtime_detach();
> >>
> >> - /* Fix up caches for EFI payloads if necessary */
> >> - efi_exit_caches();
> >> -
> >> /* This stops all lingering devices */
> >> bootm_disable_interrupts();
> >>
> >> @@ -2893,8 +2867,6 @@ efi_status_t EFIAPI efi_start_image(efi_handle_t
> >> image_handle,
> >> if (ret != EFI_SUCCESS)
> >> return EFI_EXIT(EFI_INVALID_PARAMETER);
> >>
> >> - efi_is_direct_boot = false;
> >> -
> >> image_obj->exit_data_size = exit_data_size;
> >> image_obj->exit_data = exit_data;
> >>
> >> --
> >> 2.20.1
> >>
> >
>
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 1/3] spl: imx6: Let spl_boot_device return USDHC1 or USDHC2
> Currently, when the spl_boot_device checks the boot device, it
> will only return MMC1 when it's either sd or eMMC regardless
> of whether or not it's MMC1 or MMC2. This is a problem when
> booting from MMC2 if MMC isn't being manually configured like in
> the DM_SPL case with SPL_OF_CONTROL.
> This patch will check the register and return either MMC1 or MMC2.
> Signed-off-by: Adam Ford
> diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c
> index 9f1e0f6a72..1f230aca33 100644
> --- a/arch/arm/mach-imx/spl.c
> +++ b/arch/arm/mach-imx/spl.c
> @@ -24,6 +24,7 @@ u32 spl_boot_device(void)
> {
> unsigned int bmode = readl(_base->sbmr2);
> u32 reg = imx6_src_get_boot_mode();
> + u32 mmc_index = ((reg >> 11) & 0x03);
>
> /*
>* Check for BMODE if serial downloader is enabled
> @@ -84,11 +85,12 @@ u32 spl_boot_device(void)
> /* SD/eSD: 8.5.3, Table 8-15 */
> case IMX6_BMODE_SD:
> case IMX6_BMODE_ESD:
> - return BOOT_DEVICE_MMC1;
> - /* MMC/eMMC: 8.5.3 */
> case IMX6_BMODE_MMC:
> case IMX6_BMODE_EMMC:
> - return BOOT_DEVICE_MMC1;
> + if (mmc_index == 1)
> + return BOOT_DEVICE_MMC2;
> + else
> + return BOOT_DEVICE_MMC1;
> /* NAND Flash: 8.5.2, Table 8-10 */
> case IMX6_BMODE_NAND_MIN ... IMX6_BMODE_NAND_MAX:
> return BOOT_DEVICE_NAND;
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de
=
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 1/1] pico-imx7d: Enable DM_USB
> This patch enable usb support with device-tree > Signed-off-by: Joris Offouga > Reviewed-by: Jun Nie Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH V2 2/2] watchdog: imx: Add DM support
> Add DM and DT probing support to iMX watchdog driver. This should > allow boards to move over to this driver, enable SYSRESET_WATCHDOG > to handle cpu_reset() if required. > Signed-off-by: Marek Vasut > Cc: Peng Fan > Cc: Stefano Babic > Tested-by: Heiko Schocher Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v6 6/6] spi: mxs: Add support DM/DTS for i.MX28 mxs SPI driver (DM_SPI conversion)
> This patch converts mxs_spi driver to support DM/DTS. > Signed-off-by: Lukasz Majewski > Reviewed-by: Marek Vasut Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v5 13/18] dts: sandbox: Add 'osc' clock for Common Clock Framework [CCF] testing
> This patch adds the 'osc' fixed clock to facilitate the CCF testing in > the sandbox U-Boot. It is a starting point for building CCF hierarchy of > clocks. > Signed-off-by: Lukasz Majewski Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 3/3] ARM: imx6q_logic: With SPL_OF_CONTROL enabled, remove MMC init
> Since the board uses SPL_OF_CONTROL now, we don't need to
> explicitly initialize the MMC driver, but we still need to
> pinmux the corresponding pins. This patch removes the
> initialization code and leave just the muxing behind.
> Signed-off-by: Adam Ford
> diff --git a/board/logicpd/imx6/imx6logic.c b/board/logicpd/imx6/imx6logic.c
> index b17a3b1d39..ab1c7f266e 100644
> --- a/board/logicpd/imx6/imx6logic.c
> +++ b/board/logicpd/imx6/imx6logic.c
> @@ -222,25 +222,15 @@ int board_mmc_init(bd_t *bis)
> switch (reg) {
> case 0:
> SETUP_IOMUX_PADS(usdhc1_pads);
> - usdhc_cfg[0].esdhc_base = USDHC1_BASE_ADDR;
> - usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
> - gd->arch.sdhc_clk = usdhc_cfg[0].sdhc_clk;
> break;
> case 1:
> SETUP_IOMUX_PADS(usdhc2_pads);
> - usdhc_cfg[1].esdhc_base = USDHC2_BASE_ADDR;
> - usdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK);
> - gd->arch.sdhc_clk = usdhc_cfg[1].sdhc_clk;
> break;
> }
>
> - return fsl_esdhc_initialize(bis, _cfg[reg]);
> + return 0;
> }
>
> -int board_mmc_getcd(struct mmc *mmc)
> -{
> - return 1;
> -}
> #endif
>
> static void ccgr_init(void)
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de
=
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v5 08/18] dm: clk: Define clk_get_parent() for clk operations
> This commit adds the clk_get_parent() function, which is responsible > for getting the parent's struct clock pointer. > U-Boot's DM support for getting parent is different (the parent > relationship is in udevice) than the one in Common Clock Framework [CCF] > in Linux. To obtain the pointer to struct clk of parent the > pdev->uclass_priv field is read via dev_get_clk_ptr() wrapper. > Signed-off-by: Lukasz Majewski > Reviewed-by: Peng Fan Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v1 1/3] ARM: imx: cosmetic: Remove not needed comment from the mccmon6.h file
> This comment is a leftover from the Kconfig CONFIG_*MTD* move. > Signed-off-by: Lukasz Majewski Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
