November 2014 - U-Boot

[U-Boot] set and test a local variable in a script
by Andreas Neubacher 23 Nov '14

23 Nov '14

hi, i'm trying to set a local variable and test the variable in an if-then-else script ... but it's somehow a bit weird!? - set variable "nea" to 0 - create a script "x" and run .... OK - modify variable "nea" to 1 - run script "x" again ... NOK?! ... what i'm doing wrong - the behavior is the same with 2013.10 and 2014.01 >U-Boot# nea=0 >U-Boot# setenv x "if itest 1 -eq $nea; then echo var1; else echo var0; fi;" >U-Boot# run x >var0 >U-Boot# nea=1 >U-Boot# run x >var0 <<<<<----- so now i should get the "var1" as a result >U-Boot# echo $nea >1 >U-Boot# setenv x "if itest 1 -eq $nea; then echo var1; else echo var0; fi;" >U-Boot# run x >var1 <<<<<------- after i set the script "x" again it's working ... ?! br & thx for any hint, Andy

2 3

[U-Boot] [PATCH v2 1/5] sun6i: Make dram clk and zq value Kconfig options
by Hans de Goede 23 Nov '14

23 Nov '14

It turns out that there is a too large spread between boards to handle this with a default value, turn this into Kconfig options, and set the values the factory images are using for the Colombus and Mele_M9 boards. Note this changes the ZQ default when not overriden through defconfig from 120 to 123, as that is what most boards seem to actually use. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- arch/arm/cpu/armv7/sunxi/dram_sun6i.c | 12 +++++------- board/sunxi/Kconfig | 17 +++++++++++++++++ configs/Colombus_defconfig | 2 ++ configs/Mele_M9_defconfig | 2 ++ 4 files changed, 26 insertions(+), 7 deletions(-) diff --git a/arch/arm/cpu/armv7/sunxi/dram_sun6i.c b/arch/arm/cpu/armv7/sunxi/dram_sun6i.c index 10a6241..30439dc 100644 --- a/arch/arm/cpu/armv7/sunxi/dram_sun6i.c +++ b/arch/arm/cpu/armv7/sunxi/dram_sun6i.c @@ -17,9 +17,7 @@ #include <asm/arch/dram.h> #include <asm/arch/prcm.h> -/* DRAM clk & zq defaults, maybe turn these into Kconfig options ? */ -#define DRAM_CLK_DEFAULT 312000000 -#define DRAM_ZQ_DEFAULT 0x78 +#define DRAM_CLK (CONFIG_DRAM_CLK * 1000000) struct dram_sun6i_para { u8 bus_width; @@ -48,7 +46,7 @@ static void mctl_sys_init(void) (struct sunxi_ccm_reg *)SUNXI_CCM_BASE; const int dram_clk_div = 2; - clock_set_pll5(DRAM_CLK_DEFAULT * dram_clk_div); + clock_set_pll5(DRAM_CLK * dram_clk_div); clrsetbits_le32(&ccm->dram_clk_cfg, CCM_DRAMCLK_CFG_DIV0_MASK, CCM_DRAMCLK_CFG_DIV0(dram_clk_div) | CCM_DRAMCLK_CFG_RST | @@ -173,7 +171,7 @@ static void mctl_channel_init(int ch_index, struct dram_sun6i_para *para) await_completion(&mctl_phy->pgsr, 0x03, 0x03); - writel(DRAM_ZQ_DEFAULT, &mctl_phy->zq0cr1); + writel(CONFIG_DRAM_ZQ, &mctl_phy->zq0cr1); setbits_le32(&mctl_phy->pir, MCTL_PIR_CLEAR_STATUS); writel(MCTL_PIR_STEP1, &mctl_phy->pir); @@ -219,9 +217,9 @@ static void mctl_channel_init(int ch_index, struct dram_sun6i_para *para) await_completion(&mctl_ctl->sstat, 0x07, 0x01); /* Set number of clks per micro-second */ - writel(DRAM_CLK_DEFAULT / 1000000, &mctl_ctl->togcnt1u); + writel(DRAM_CLK / 1000000, &mctl_ctl->togcnt1u); /* Set number of clks per 100 nano-seconds */ - writel(DRAM_CLK_DEFAULT / 10000000, &mctl_ctl->togcnt100n); + writel(DRAM_CLK / 10000000, &mctl_ctl->togcnt100n); /* Set memory timing registers */ writel(MCTL_TREFI, &mctl_ctl->trefi); writel(MCTL_TMRD, &mctl_ctl->tmrd); diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index 246cd9a..6162227 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -32,6 +32,23 @@ config MACH_SUN8I endchoice +if MACH_SUN6I + +config DRAM_CLK + int "sun6i dram clock speed" + default 312 + ---help--- + Set the dram clock speed, valid range 240 - 480, must be a multiple + of 24. + +config DRAM_ZQ + int "sun6i dram zq value" + default 123 + ---help--- + Set the dram zq value. + +endif + config SYS_CONFIG_NAME string default "sun4i" if MACH_SUN4I diff --git a/configs/Colombus_defconfig b/configs/Colombus_defconfig index de78a01..9b4968f 100644 --- a/configs/Colombus_defconfig +++ b/configs/Colombus_defconfig @@ -5,3 +5,5 @@ CONFIG_USB_KEYBOARD=n +S:CONFIG_ARCH_SUNXI=y +S:CONFIG_MACH_SUN6I=y +S:CONFIG_TARGET_COLOMBUS=y ++S:CONFIG_DRAM_CLK=288 ++S:CONFIG_DRAM_ZQ=379 diff --git a/configs/Mele_M9_defconfig b/configs/Mele_M9_defconfig index 40eabce..740b931 100644 --- a/configs/Mele_M9_defconfig +++ b/configs/Mele_M9_defconfig @@ -5,6 +5,8 @@ CONFIG_FDTFILE="sun6i-a31-m9.dtb" +S:CONFIG_ARCH_SUNXI=y +S:CONFIG_MACH_SUN6I=y +S:CONFIG_TARGET_MELE_M9=y ++S:CONFIG_DRAM_CLK=312 ++S:CONFIG_DRAM_ZQ=120 # Ethernet phy power +S:CONFIG_AXP221_DLDO1_VOLT=3300 # USB hub power -- 2.1.0

1 0

[U-Boot] [PATCH] cros_ec: Fix uninitialised variable in cros_ec.c
by Simon Glass 23 Nov '14

23 Nov '14

This fixes this cppcheck report: [drivers/misc/cros_ec.c:704]: (error) Uninitialized variable: req Signed-off-by: Simon Glass <sjg(a)chromium.org> Reported-by: Wolfgang Denk <wd(a)denx.de> --- drivers/misc/cros_ec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/misc/cros_ec.c b/drivers/misc/cros_ec.c index 521edfd..9b4effb 100644 --- a/drivers/misc/cros_ec.c +++ b/drivers/misc/cros_ec.c @@ -701,6 +701,7 @@ static int cros_ec_check_version(struct cros_ec_dev *dev) /* Try sending a version 3 packet */ dev->protocol_version = 3; + req.in_data = 0; if (ec_command_inptr(dev, EC_CMD_HELLO, 0, &req, sizeof(req), (uint8_t **)&resp, sizeof(*resp)) > 0) { return 0; -- 2.1.0.rc2.206.gedb03e5

1 1

[U-Boot] [PATCH v2 0/17] dm: Add I2C support and convert sandbox, tegra
by Simon Glass 23 Nov '14

23 Nov '14

This series adds I2C support to driver model. It has become apparent that this is a high priority as it is widely used. It follows along to some extent from the SPI conversion. Several changes are made from the original I2C implementations. Firstly it is not necessary to specify the chip address with every call, since each chip knows its own address - it is stored in struct dm_i2c_chip which is attached to each chip on the I2C bus. However, this information *is* passed to the driver since I presume most drivers need it and it would be cumbersome to look up in every call. Secondly there is no concept of a 'current' I2C bus so all associated logic is removed. With driver model i2c_set_bus_num() and i2c_get_bus_num() are not available. Since the chip device specifies both the bus and the chip address, there is no need for this concept. It also causes problems when one driver changes the current bus and forgets to change it back. Thirdly initialisation is handled by driver model's normal probe() method on each device so there should be no need for i2c_init_all(), i2c_init(), i2c_init_board(), i2c_board_late_init() and board_i2c_init(). I2C muxes are not yet supported. To support these we will need to maintain state of the current mux settings to avoid resetting every mux every time. Probably we need to add a sandbox I2C mux driver to permit testing of this. This can probably be done later. Platform data is not yet supported either, only device tree. The U_BOOT_I2C_MKENT_COMPLETE() and U_BOOT_I2C_ADAP_COMPLETE() macros are not used. Also struct i2c_adapter is not defined anymore. This will need to be addressed, perhaps as part of converting over a board that does not use device tree, assuming that we want to support this. The following I2C CONFIGs are no-longer needed when driver model is used: CONFIG_SYS_I2C_INIT_BOARD - each I2C bus is inited in its probe() method CONFIG_I2C_MULTI_BUS - we always support multi-bus with driver model CONFIG_SYS_MAX_I2C_BUS - the device tree aliases define available buses CONFIG_SYS_I2C_SPEED - the device tree specifies the speed for each bus CONFIG_SYS_I2C - this is the 'new old' API, now deprecated There are a few SPI patches included here due to a dependency on a new device binding function. This series is available at u-boot-dm/i2c-working. Changes in v2: - Add a suitable commit message - Add new patch to correct handling of aliases with embedded digits - Add new patch to add a function to bind a device by driver name - Add new patches to adjust SPI to use device_bind_driver() - Fix cihp typo - Implement generic I2C devices to allow 'i2c probe' on unknown devices - Return the probed device from i2c_probe() - Set the bus speed after the bus is probed - Add some debugging for generic I2C device binding - Add a 'deblock' method to recover an I2C bus stuck in mid-transaction - Add a helper function to find a chip on a particular bus number - Change alen to int so that it can be -1 (this was a bug) - Call the deblock() method for 'i2c reset' - Update commit message for EEPROM driver - Add a test for automatic binding of generic I2C devices - Add a new asm/test.h header for tests in sandbox - Adjust tegra_i2c_child_pre_probe() to permit generic I2C devices - Correct the compatible strings for I2C buses - Don't init if the speed is 0, since this breaks the controller - Expand coverage to all Tegra boards Simon Glass (17): dm: i2c: Move error reporting into a common function dm: core: Allow access to the device's driver_id data dm: core: Add functions to find parent and OF data dm: fdt: Correct handling of aliases with embedded digits dm: Add a function to bind a device by driver name dm: spi: Correct handling of SPI chip selects in sandbox dm: spi: Use device_bind_driver() instead of our own function dm: i2c: Add a uclass for I2C dm: i2c: Implement driver model support in the i2c command dm: i2c: Add I2C emulation driver for sandbox dm: i2c: Add a sandbox I2C driver dm: i2c: Add an I2C EEPROM simulator dm: i2c: config: Enable I2C for sandbox using driver model dm: i2c: dts: Add an I2C bus for sandbox dm: Add a simple EEPROM driver dm: i2c: Add tests for I2C dm: i2c: tegra: Convert to driver model arch/arm/cpu/tegra20-common/pmu.c | 21 +- arch/arm/dts/tegra124-jetson-tk1.dts | 1 - arch/arm/dts/tegra124-norrin.dts | 1 - arch/arm/dts/tegra30-tec-ng.dts | 4 + arch/arm/include/asm/arch-tegra/tegra_i2c.h | 2 +- arch/sandbox/dts/sandbox.dts | 17 ++ arch/sandbox/include/asm/test.h | 15 ++ board/avionic-design/common/tamonten-ng.c | 12 +- board/nvidia/cardhu/cardhu.c | 13 +- board/nvidia/common/board.c | 4 - board/nvidia/dalmore/dalmore.c | 21 +- board/nvidia/whistler/whistler.c | 29 ++- board/toradex/apalis_t30/apalis_t30.c | 19 +- common/cmd_i2c.c | 350 +++++++++++++++++++++++----- drivers/core/device.c | 10 + drivers/core/lists.c | 38 ++- drivers/i2c/Makefile | 2 + drivers/i2c/i2c-emul-uclass.c | 14 ++ drivers/i2c/i2c-uclass.c | 275 ++++++++++++++++++++++ drivers/i2c/sandbox_i2c.c | 156 +++++++++++++ drivers/i2c/tegra_i2c.c | 320 ++++++++++--------------- drivers/misc/Makefile | 4 + drivers/misc/i2c_eeprom.c | 51 ++++ drivers/misc/i2c_eeprom_emul.c | 108 +++++++++ drivers/mtd/spi/sandbox.c | 4 +- drivers/power/tps6586x.c | 27 +-- drivers/spi/spi-uclass.c | 34 +-- include/config_fallbacks.h | 6 + include/configs/apalis_t30.h | 3 - include/configs/beaver.h | 3 - include/configs/cardhu.h | 5 - include/configs/colibri_t30.h | 3 - include/configs/dalmore.h | 5 - include/configs/jetson-tk1.h | 5 - include/configs/norrin.h | 5 - include/configs/sandbox.h | 6 + include/configs/seaboard.h | 3 - include/configs/tec-ng.h | 5 - include/configs/tegra-common.h | 1 + include/configs/tegra114-common.h | 3 - include/configs/tegra124-common.h | 3 - include/configs/tegra20-common.h | 3 - include/configs/tegra30-common.h | 3 - include/configs/trimslice.h | 3 - include/configs/venice2.h | 5 - include/configs/whistler.h | 3 - include/dm/device.h | 19 ++ include/dm/lists.h | 13 ++ include/dm/uclass-id.h | 4 + include/i2c.h | 288 +++++++++++++++++++++++ include/i2c_eeprom.h | 19 ++ include/spi.h | 14 +- include/tps6586x.h | 4 +- lib/fdtdec.c | 6 +- test/dm/Makefile | 1 + test/dm/i2c.c | 112 +++++++++ test/dm/test.dts | 17 ++ 57 files changed, 1690 insertions(+), 432 deletions(-) create mode 100644 arch/sandbox/include/asm/test.h create mode 100644 drivers/i2c/i2c-emul-uclass.c create mode 100644 drivers/i2c/i2c-uclass.c create mode 100644 drivers/i2c/sandbox_i2c.c create mode 100644 drivers/misc/i2c_eeprom.c create mode 100644 drivers/misc/i2c_eeprom_emul.c create mode 100644 include/i2c_eeprom.h create mode 100644 test/dm/i2c.c -- 2.1.0.rc2.206.gedb03e5

6 86

[U-Boot] [PATCH v3 0/14] dm: Implement driver model support in SPL
by Simon Glass 23 Nov '14

23 Nov '14

Now that driver model operations prior to relocation, the remaining area where it does not work is SPL. This series enables this. Since SPL is quite memory-constrained, code and data size need to be kept as small as possible. This series includes a few changes to help with this: - Small and simple malloc() implementation - Dropping device removal features - Dropping stdio features - Dropping driver model warnings With these the code size impact of driver model is small, around 2-3KB. Data usage is typically 200-300 bytes. In many cases this can squeeze into the available SPL RAM space. This requires a revert of the SPL global_data revert (commit 1ee30ae). I believe that is planned for early in this merge window. We need that revert undone to be able to support the simple malloc in SPL on ARM. Note that the driver model docs will be added/moved to Kconfig in a follow-on patch. This series is available at u-boot-dm branch 'spl-working'. Changes in v3: - Add new patch to avoid using arch-specific memcpy() in SPL - Add #ifdef around serial_stub_puts() to fix error when building SPL - Rebase to master Changes in v2: - Correct the Makefile condition for simple_malloc - Rebase on top of the SPI series - Rebase to master Simon Glass (14): arm: spl: Avoid setting up a duplicate global data structure dm: tegra: Avoid using arch-specific memcpy() in SPL dm: Split the simple malloc() implementation into its own file dm: arm: spl: Allow simple malloc() in SPL dm: spl: Make simple malloc() available when enabled dm: spl: Allow driver model to be used dm: Allow device removal features to be dropped dm: Allow stdio registration to be dropped dm: Disable dm_warn() in SPL dm: tegra: Add platform data for the SPL uart dm: tegra: Add platform data for the GPIO driver dm: arm: spl: Make driver model linker lists available dm: tegra: Enable driver model in SPL and adjust the GPIO driver dm: Update documentation to include CONFIG_DM... options README | 119 ++++++++++++++++++++++++ arch/arm/cpu/u-boot-spl.lds | 7 ++ arch/arm/lib/crt0.S | 2 +- arch/arm/lib/spl.c | 4 - board/nvidia/common/board.c | 8 ++ board/nvidia/seaboard/seaboard.c | 4 +- common/Makefile | 3 + common/board_r.c | 3 +- common/dlmalloc.c | 19 +--- common/malloc_simple.c | 39 ++++++++ common/spl/spl.c | 16 +++- doc/driver-model/README.txt | 44 +++++++-- drivers/core/Makefile | 3 +- drivers/core/device-remove.c | 187 ++++++++++++++++++++++++++++++++++++++ drivers/core/device.c | 168 ---------------------------------- drivers/gpio/Makefile | 4 + drivers/gpio/tegra_gpio.c | 27 +++--- drivers/serial/serial-uclass.c | 10 +- drivers/serial/serial_tegra.c | 16 ++++ include/asm-generic/global_data.h | 1 + include/config_defaults.h | 6 ++ include/configs/tegra-common.h | 14 +-- include/dm/device-internal.h | 10 ++ include/dm/util.h | 6 ++ include/malloc.h | 60 +++++++----- scripts/Makefile.spl | 1 + 26 files changed, 527 insertions(+), 254 deletions(-) create mode 100644 common/malloc_simple.c create mode 100644 drivers/core/device-remove.c -- 2.1.0.rc2.206.gedb03e5

3 27

[U-Boot] [PATCH v2 0/9] dm: Introduce driver model for Atmel at91
by Simon Glass 23 Nov '14

23 Nov '14

This series adds driver model support for serial and GPIO for the Atmel AT91 series. The at91sam9260-based Snapper 9260 is converted over as an example. For both drivers the old behaviour is retained, so driver model becomes optional, not mandatory. This series is available at u-boot-dm/atmel-working. Changes in v2: - Use a text base of 0x21f00000 - Remove unnecessary port number check - Use GPIO_PER_BANK instead of 32 in more places - Use PA/PB/PC instead of A/B/C for GPIO port names - Rename header to atmel_serial.h and use atmel instead of at91 throughout - Update platform data and header #include for the new driver name - Add new patch to add myself as maintainer for snapper9260 - Add a patch to implement baud rate changes Simon Glass (9): dm: at91: Correct text base for snapper9260 dm: at91: Move snapper9260 to generic baord dm: at91: Add driver model support for atmel GPIO driver dm: at91: Add platform data for GPIO on at91sam9260-based boards dm: at91: Refactor serial driver slightly for driver model dm: at91: Add driver model support for the serial driver dm: at91: Convert snapper9260 to use driver model dm: at91: Add myself as maintainer for snapper9260 dm: serial: Support changing the baud rate arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c | 14 ++ arch/arm/include/asm/arch-at91/at91sam9260.h | 4 +- arch/arm/include/asm/arch-at91/atmel_serial.h | 15 ++ arch/arm/include/asm/arch-at91/gpio.h | 6 + board/bluewater/snapper9260/MAINTAINERS | 2 +- board/bluewater/snapper9260/snapper9260.c | 18 +- drivers/gpio/at91_gpio.c | 241 +++++++++++++++++----- drivers/serial/atmel_usart.c | 116 ++++++++++- drivers/serial/serial-uclass.c | 67 ++++++ include/configs/snapper9260.h | 12 +- 10 files changed, 426 insertions(+), 69 deletions(-) create mode 100644 arch/arm/include/asm/arch-at91/atmel_serial.h -- 2.1.0.rc2.206.gedb03e5

2 21

[U-Boot] [PATCH] sunxi: correct Mele M9 Vbus gpio settings
by Hans de Goede 23 Nov '14

23 Nov '14

I noticed that the kernel and u-boot settings were different, double checking has confirmed that the kernel settings are correct. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- configs/Mele_M9_defconfig | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configs/Mele_M9_defconfig b/configs/Mele_M9_defconfig index 6f466ca..a598254 100644 --- a/configs/Mele_M9_defconfig +++ b/configs/Mele_M9_defconfig @@ -16,5 +16,7 @@ CONFIG_FDTFILE="sun6i-a31-m9.dtb" # HDMI power ? +S:CONFIG_AXP221_ALDO2_VOLT=1800 +S:CONFIG_AXP221_ALDO3_VOLT=3000 -# No Vbus gpio for usb1 -+S:CONFIG_USB1_VBUS_PIN="" +# Vbus gpio for usb1 ++S:CONFIG_USB1_VBUS_PIN="PC27" +# No Vbus gpio for usb2 ++S:CONFIG_USB2_VBUS_PIN="" -- 2.1.0

2 1

[U-Boot] [PATCH 1/2] config_distro_bootcmd.h: Allow user to indicate that usb is inited in preboot
by Hans de Goede 23 Nov '14

23 Nov '14

When using usb-keyboard support, typically usb will already get started from preboot. In this case doing it again in the bootcmd is undesirable. Allow the user of config_distro_bootcmd to indicate that usb is inited in preboot through the user setting BOOTENV_PREBOOT_INITS_USB. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- include/config_distro_bootcmd.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h index be616e8..fd01a34 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -91,7 +91,11 @@ #ifdef CONFIG_CMD_USB #define BOOTENV_RUN_USB_INIT "run usb_init; " +#ifndef BOOTENV_PREBOOT_INITS_USB #define BOOTENV_SET_USB_NEED_INIT "setenv usb_need_init; " +#else +#define BOOTENV_SET_USB_NEED_INIT "setenv usb_need_init false; " +#endif #define BOOTENV_SHARED_USB \ "usb_init=" \ "if ${usb_need_init}; then " \ -- 2.1.0

1 1

[U-Boot] [PATCH] sunxi: Use "usb start" rather then "run usb_init" for preboot with usb-kbd
by Hans de Goede 23 Nov '14

23 Nov '14

In an effort to avoid usb getting scanned twice when using an usb keyboard, and booting from usb, I've set preboot to "run usb_init" in the CONFIG_USB_KEYBOARD patch. This is wrong however, as it causes usb to not be scanned (and the keyboard to not be found) if an "env save" is done, since then the env contains usb_need_init=false. This commit fixes this by changing the preboot value to "usb start", so that usb gets scanned for a keyboard unconditionally when usb-keyboard support is enabled. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- include/configs/sunxi-common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index fcaa249..3f890b2 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -306,7 +306,7 @@ #ifdef CONFIG_USB_KEYBOARD #define CONSOLE_STDIN_SETTINGS \ - "preboot=run usb_init\0" \ + "preboot=usb start\0" \ "stdin=serial,usbkbd\0" #else #define CONSOLE_STDIN_SETTINGS \ -- 2.1.0

2 1

[U-Boot] [PATCH] config_distro_bootcmd: Avoid scanning usb twice (under some circumstances)
by Hans de Goede 23 Nov '14

23 Nov '14

When using usb-keyboard support, the preboot env variable must be set to a command to scan usb, so that the keyboard is available to interrupt autoboot. The logical command to add when using config_distro_bootcmd.h is "run usb_init", as that does a "setenv usb_need_init false" which should avoid a second scan when booting from usb. However this does not work because config_distro_bootcmd sets bootcmd to "setenv usb_need_init; ...". This is not necessary "if ${usb_need_init}" will evaluate to true just as well if usb_need_init is not set at all. So drop the BOOTENV_SET_USB_NEED_INIT macro and calling of it, thereby fixing the double usb-scan. While at it do the same for scsi_need_init which was modelled after the usb code. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- include/config_distro_bootcmd.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h index be616e8..2b515bc 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -54,7 +54,6 @@ #ifdef CONFIG_CMD_SCSI #define BOOTENV_RUN_SCSI_INIT "run scsi_init; " -#define BOOTENV_SET_SCSI_NEED_INIT "setenv scsi_need_init; " #define BOOTENV_SHARED_SCSI \ "scsi_init=" \ "if ${scsi_need_init}; then " \ @@ -69,7 +68,6 @@ #define BOOTENV_DEV_NAME_SCSI BOOTENV_DEV_NAME_BLKDEV #else #define BOOTENV_RUN_SCSI_INIT -#define BOOTENV_SET_SCSI_NEED_INIT #define BOOTENV_SHARED_SCSI #define BOOTENV_DEV_SCSI \ BOOT_TARGET_DEVICES_references_SCSI_without_CONFIG_CMD_SCSI @@ -91,7 +89,6 @@ #ifdef CONFIG_CMD_USB #define BOOTENV_RUN_USB_INIT "run usb_init; " -#define BOOTENV_SET_USB_NEED_INIT "setenv usb_need_init; " #define BOOTENV_SHARED_USB \ "usb_init=" \ "if ${usb_need_init}; then " \ @@ -106,7 +103,6 @@ #define BOOTENV_DEV_NAME_USB BOOTENV_DEV_NAME_BLKDEV #else #define BOOTENV_RUN_USB_INIT -#define BOOTENV_SET_USB_NEED_INIT #define BOOTENV_SHARED_USB #define BOOTENV_DEV_USB \ BOOT_TARGET_DEVICES_references_USB_without_CONFIG_CMD_USB @@ -202,7 +198,7 @@ \ BOOT_TARGET_DEVICES(BOOTENV_DEV) \ \ - "bootcmd=" BOOTENV_SET_USB_NEED_INIT BOOTENV_SET_SCSI_NEED_INIT \ + "bootcmd=" \ "for target in ${boot_targets}; do " \ "run bootcmd_${target}; " \ "done\0" -- 2.1.0

1 1