From a8a508270be28d5d234e760cc3406cfad188b1d2 Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Tue, 11 Jun 2019 11:12:22 +0200 Subject: commands: don't use stale errno when calling fb_open fb_open returns a pointer and doesn't populate errno, which will result in a stale errno being evaluated by perror() on failure. Fix this by using strerror with the proper argument instead at call sites. While at it, correct the message prefix typo (s/fb_open/fb_open/). Signed-off-by: Ahmad Fatoum Signed-off-by: Sascha Hauer --- commands/fbtest.c | 5 +++-- commands/splash.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/commands/fbtest.c b/commands/fbtest.c index e5dd8ba7fa..ff24a8252a 100644 --- a/commands/fbtest.c +++ b/commands/fbtest.c @@ -271,8 +271,9 @@ static int do_fbtest(int argc, char *argv[]) sc = fb_open(fbdev); if (IS_ERR(sc)) { - perror("fd_open"); - return PTR_ERR(sc); + int ret = -PTR_ERR(sc); + printf("fb_open: %s\n", strerror(ret)); + return ret; } if (!pattern_name) { diff --git a/commands/splash.c b/commands/splash.c index 2b70b29683..abd82873cb 100644 --- a/commands/splash.c +++ b/commands/splash.c @@ -54,8 +54,9 @@ static int do_splash(int argc, char *argv[]) sc = fb_open(fbdev); if (IS_ERR(sc)) { - perror("fd_open"); - return PTR_ERR(sc); + int ret = -PTR_ERR(sc); + printf("fb_open: %s\n", strerror(ret)); + return ret; } buf = gui_screen_render_buffer(sc); -- cgit v1.2.3 From 5c88c98d524ff9cd7f7fb0fe4782c508917346ec Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Tue, 11 Jun 2019 11:12:53 +0200 Subject: treewide: remove stale mentions of CONFIG_OF in comments barebox doesn't define a CONFIG_OF kconfig option, but CONFIG_OFTREE for the device tree handling and CONFIG_OFDEVICE for probing devices out of the device tree. Replace comment mentions of CONFIG_OF with mentions of either as appropriate. Signed-off-by: Ahmad Fatoum Signed-off-by: Sascha Hauer --- drivers/i2c/i2c-mux.c | 2 +- drivers/usb/misc/usb251xb.c | 4 ++-- include/linux/nvmem-consumer.h | 2 +- include/of_device.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c index f87e1fadb6..ab31da61d6 100644 --- a/drivers/i2c/i2c-mux.c +++ b/drivers/i2c/i2c-mux.c @@ -96,7 +96,7 @@ struct i2c_adapter *i2c_add_mux_adapter(struct i2c_adapter *parent, /* * Try to populate the mux adapter's device_node, expands to - * nothing if !CONFIG_OF. + * nothing if !CONFIG_OFDEVICE. */ if (mux_dev->device_node) { struct device_node *child; diff --git a/drivers/usb/misc/usb251xb.c b/drivers/usb/misc/usb251xb.c index 97f55efa82..a7a444e039 100644 --- a/drivers/usb/misc/usb251xb.c +++ b/drivers/usb/misc/usb251xb.c @@ -612,13 +612,13 @@ static const struct of_device_id usb251xb_of_match[] = { /* sentinel */ } }; -#else /* CONFIG_OF */ +#else /* CONFIG_OFDEVICE */ static int usb251xb_get_ofdata(struct usb251xb *hub, struct usb251xb_data *data) { return 0; } -#endif /* CONFIG_OF */ +#endif /* CONFIG_OFDEVICE */ static int usb251xb_probe(struct usb251xb *hub) { diff --git a/include/linux/nvmem-consumer.h b/include/linux/nvmem-consumer.h index 32ea46e3bf..9e0fd4265e 100644 --- a/include/linux/nvmem-consumer.h +++ b/include/linux/nvmem-consumer.h @@ -103,6 +103,6 @@ static inline struct nvmem_device *of_nvmem_device_get(struct device_node *np, { return ERR_PTR(-ENOSYS); } -#endif /* CONFIG_NVMEM && CONFIG_OF */ +#endif /* CONFIG_NVMEM && CONFIG_OFTREE */ #endif /* ifndef _LINUX_NVMEM_CONSUMER_H */ diff --git a/include/of_device.h b/include/of_device.h index 44c1c0f545..54410ad12f 100644 --- a/include/of_device.h +++ b/include/of_device.h @@ -22,7 +22,7 @@ static inline int of_driver_match_device(struct device_d *dev, extern const void *of_device_get_match_data(const struct device_d *dev); -#else /* CONFIG_OF */ +#else /* CONFIG_OFTREE */ static inline int of_driver_match_device(struct device_d *dev, const struct device_d *drv) @@ -43,6 +43,6 @@ static inline const struct of_device_id *__of_match_device( #define of_match_device(matches, dev) \ __of_match_device(matches, (dev)) -#endif /* CONFIG_OF */ +#endif /* CONFIG_OFTREE */ #endif /* _LINUX_OF_DEVICE_H */ -- cgit v1.2.3 From cf917f051e579d29098e6b334a4ef0ffde59f0fb Mon Sep 17 00:00:00 2001 From: Peter Mamonov Date: Tue, 11 Jun 2019 13:18:33 +0300 Subject: pbl: report decompression failure Signed-off-by: Peter Mamonov Signed-off-by: Sascha Hauer --- pbl/decomp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pbl/decomp.c b/pbl/decomp.c index c8014c403f..72a162309a 100644 --- a/pbl/decomp.c +++ b/pbl/decomp.c @@ -7,6 +7,7 @@ #include #include +#include #define STATIC static @@ -40,6 +41,9 @@ STATIC int decompress(u8 *input, int in_len, static void noinline errorfn(char *error) { + puts_ll("ERROR: "); + puts_ll(error); + puts_ll("\nHANG\n"); while (1); } -- cgit v1.2.3 From 64aa954061b9a19d7875fee6cc843f1ff3670dd6 Mon Sep 17 00:00:00 2001 From: Uwe Kleine-König Date: Fri, 14 Jun 2019 11:58:22 +0200 Subject: mtd: spi-nor: Add support for ISSI flashes from Linux MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The definitions are taken from Linux's spi-nor driver as of v5.2-rc4. Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer --- drivers/mtd/spi-nor/spi-nor.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index 43bd402f9f..b2052ce0af 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -671,6 +671,27 @@ static const struct spi_device_id spi_nor_ids[] = { { "640s33b", INFO(0x898913, 0, 64 * 1024, 128, 0) }, /* ISSI */ + { "is25cd512", INFO(0x7f9d20, 0, 32 * 1024, 2, SECT_4K) }, + { "is25lq040b", INFO(0x9d4013, 0, 64 * 1024, 8, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, + { "is25lp016d", INFO(0x9d6015, 0, 64 * 1024, 32, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, + { "is25lp080d", INFO(0x9d6014, 0, 64 * 1024, 16, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, + { "is25lp032", INFO(0x9d6016, 0, 64 * 1024, 64, + SECT_4K | SPI_NOR_DUAL_READ) }, + { "is25lp064", INFO(0x9d6017, 0, 64 * 1024, 128, + SECT_4K | SPI_NOR_DUAL_READ) }, + { "is25lp128", INFO(0x9d6018, 0, 64 * 1024, 256, + SECT_4K | SPI_NOR_DUAL_READ) }, + { "is25lp256", INFO(0x9d6019, 0, 64 * 1024, 512, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) }, + { "is25wp032", INFO(0x9d7016, 0, 64 * 1024, 64, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, + { "is25wp064", INFO(0x9d7017, 0, 64 * 1024, 128, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, + { "is25wp128", INFO(0x9d7018, 0, 64 * 1024, 256, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { "is25lq128", INFO(0x9d6018, 0, 64 * 1024, 256, 0) }, /* Macronix */ -- cgit v1.2.3 From b66b5822204af2b4fa12795d4c641202d2873742 Mon Sep 17 00:00:00 2001 From: Cory Tusar Date: Fri, 14 Jun 2019 22:58:32 +0000 Subject: ARM: zii-vf610-dev: Trivial spelling fix s/Couln't/Couldn't/ Signed-off-by: Cory Tusar Signed-off-by: Sascha Hauer --- arch/arm/boards/zii-vf610-dev/board.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boards/zii-vf610-dev/board.c b/arch/arm/boards/zii-vf610-dev/board.c index 90d4535684..0697a1660e 100644 --- a/arch/arm/boards/zii-vf610-dev/board.c +++ b/arch/arm/boards/zii-vf610-dev/board.c @@ -91,7 +91,7 @@ static int zii_vf610_dev_print_clocks(void) ccm_np = of_find_compatible_node(NULL, NULL, "fsl,vf610-ccm"); if (!ccm_np) { - pr_err("Couln't get CCM node\n"); + pr_err("Couldn't get CCM node\n"); return -ENOENT; } -- cgit v1.2.3 From 19a08eb51fe6fe70ab56de7fa1a3fa1250fa6dd1 Mon Sep 17 00:00:00 2001 From: Marco Felsch Date: Mon, 17 Jun 2019 11:51:25 +0200 Subject: usb: usb251xb: fix optional reset gpio request Linux requests the reset gpio optional by using devm_gpiod_get_optional(). We need to do this here too because the reset can be a global shared reset line e.g. board por. We haven't such a helper so just drop the final else path. Fixes: 937fa50d9c ("usb: Port Microchip USB251x USB hub driver from Linux") Signed-off-by: Marco Felsch Signed-off-by: Sascha Hauer --- drivers/usb/misc/usb251xb.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/usb/misc/usb251xb.c b/drivers/usb/misc/usb251xb.c index a7a444e039..10d5aa310b 100644 --- a/drivers/usb/misc/usb251xb.c +++ b/drivers/usb/misc/usb251xb.c @@ -339,7 +339,7 @@ static int usb251xb_get_ofdata(struct usb251xb *hub, { struct device_d *dev = hub->dev; struct device_node *np = dev->device_node; - int len, err, i; + int len, i; u32 port, property_u32 = 0; const u32 *cproperty_u32; const char *cproperty_char; @@ -374,10 +374,6 @@ static int usb251xb_get_ofdata(struct usb251xb *hub, return ret; } else if (hub->gpio_reset == -EPROBE_DEFER) { return -EPROBE_DEFER; - } else { - err = hub->gpio_reset; - dev_err(dev, "unable to request GPIO reset pin (%d)\n", err); - return err; } if (of_property_read_u16_array(np, "vendor-id", &hub->vendor_id, 1)) -- cgit v1.2.3 From 1d873eb8e1644fb6a66e6e08e45cf4547d7ff75a Mon Sep 17 00:00:00 2001 From: Marco Felsch Date: Mon, 17 Jun 2019 12:00:53 +0200 Subject: ARM: phytec-som-imx6: update automount net entries It seems that the /mnt/tftp was copied from the defaultenv-2. The defaultenv-2 got a update to make it more robust by enabling all interfaces. During this sync I added a entry to support automount for /mnt/nfs mountpoint. Cc: Stefan Christ Signed-off-by: Marco Felsch Signed-off-by: Sascha Hauer --- .../defaultenv-physom-imx6-phycore/init/automount | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6-phycore/init/automount b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6-phycore/init/automount index 91ded44119..13a5b626b7 100644 --- a/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6-phycore/init/automount +++ b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6-phycore/init/automount @@ -1,9 +1,16 @@ #!/bin/sh -# automount tftp server based on $eth0.serverip +# automount tftp server mkdir -p /mnt/tftp -automount /mnt/tftp 'ifup eth0 && mount -t tftp $eth0.serverip /mnt/tftp' +automount /mnt/tftp 'ifup -a && mount -t tftp $global.net.server /mnt/tftp' + +# automount nfs server's nfsroot + +mkdir -p /mnt/nfs +automount /mnt/nfs 'ifup -a && mount -t nfs ${global.net.server}:/home/${global.user}/nfsroot/${global.hostname} /mnt/nfs' + +# automount phycore specific local mounts mkdir -p /mnt/mmc automount -d /mnt/mmc 'mmc0.probe=1 && [ -e /dev/mmc0.0 ] && mount /dev/mmc0.0 /mnt/mmc' -- cgit v1.2.3 From 72759b469267afd1db49af344991b30255be8ce8 Mon Sep 17 00:00:00 2001 From: Marco Felsch Date: Mon, 17 Jun 2019 12:00:54 +0200 Subject: defaultenv-2: net: fix comment Since commit acc3a3ef90 ("net: environment: update automounts") the tftp automount mechanism uses all network interfaces. Signed-off-by: Marco Felsch Signed-off-by: Sascha Hauer --- defaultenv/defaultenv-2-base/init/automount | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaultenv/defaultenv-2-base/init/automount b/defaultenv/defaultenv-2-base/init/automount index 5e0cb4d938..0996cea04d 100644 --- a/defaultenv/defaultenv-2-base/init/automount +++ b/defaultenv/defaultenv-2-base/init/automount @@ -1,6 +1,6 @@ #!/bin/sh -# automount tftp server based on $eth0.serverip +# automount tftp server mkdir -p /mnt/tftp automount /mnt/tftp 'ifup -a && mount -t tftp $global.net.server /mnt/tftp' -- cgit v1.2.3 From 63752a90a38439f6ef39613c5b9e48e5b40531a7 Mon Sep 17 00:00:00 2001 From: Marco Felsch Date: Mon, 17 Jun 2019 12:00:55 +0200 Subject: commands: mmc_extcsd: fix extcsd value meanings As specified by the JEDEC Standard No. 84-A441 the RESET_BOOT_BUS_WIDTH (Bit[2]) is specified the other way around. Also the BOOT_MODE is a two bit register. Signed-off-by: Marco Felsch Signed-off-by: Sascha Hauer --- commands/mmc_extcsd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/commands/mmc_extcsd.c b/commands/mmc_extcsd.c index 889a6c614a..c27bb722ea 100644 --- a/commands/mmc_extcsd.c +++ b/commands/mmc_extcsd.c @@ -861,10 +861,10 @@ static int print_field(u8 *reg, int index) str); val = get_field_val(EXT_CSD_BOOT_BUS_CONDITIONS, 2, 0x1); if (val) - str = "Reset bus width to x1, SDR and backward compatible timings after boot operation"; - else str = "Retain BOOT_BUS_WIDTH and BOOT_MODE values after boot operation"; - printf("\t[2] RESET_BOOT_BUS_CONDITIONS: %s", str); + else + str = "Reset bus width to x1, SDR and backward compatible timings after boot operation"; + printf("\t[2] RESET_BOOT_BUS_CONDITIONS: %s\n", str); val = get_field_val(EXT_CSD_BOOT_BUS_CONDITIONS, 3, 0x3); switch (val) { case 0x0: @@ -877,7 +877,7 @@ static int print_field(u8 *reg, int index) str = "Use DDR in boot operation"; break; } - printf("\t[3] BOOT_MODE: %s\n", str); + printf("\t[4-3] BOOT_MODE: %s\n", str); return 1; case EXT_CSD_BOOT_CONFIG_PROT: -- cgit v1.2.3 From a94a9bf643a77d6b793afd56efdf6afeae4be68a Mon Sep 17 00:00:00 2001 From: Marco Felsch Date: Mon, 17 Jun 2019 12:00:56 +0200 Subject: i2c: gpio: add sda/scl-gpios property support The gpios property is marked as deprecated since kernel 4.15 so we should support the "new" mechanism too. The new mechanism has a higher priority than the deprecated one. Signed-off-by: Marco Felsch Signed-off-by: Sascha Hauer --- drivers/i2c/busses/i2c-gpio.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c index 708193344a..5ab43fe935 100644 --- a/drivers/i2c/busses/i2c-gpio.c +++ b/drivers/i2c/busses/i2c-gpio.c @@ -94,18 +94,25 @@ static int of_i2c_gpio_probe(struct device_node *np, if (!IS_ENABLED(CONFIG_OFDEVICE)) return -ENODEV; - if (of_gpio_count(np) < 2) - return -ENODEV; + pdata->sda_pin = of_get_named_gpio_flags(np, "sda-gpios", 0, NULL); + pdata->scl_pin = of_get_named_gpio_flags(np, "scl-gpios", 0, NULL); + + if ((!gpio_is_valid(pdata->sda_pin) || !gpio_is_valid(pdata->scl_pin)) + && (of_gpio_count(np) >= 2)) { + /* Note: The gpios property is marked as deprecated */ + ret = of_get_gpio(np, 0); + if (ret < 0) + return ret; + pdata->sda_pin = ret; - ret = of_get_gpio(np, 0); - if (ret < 0) - return ret; - pdata->sda_pin = ret; + ret = of_get_gpio(np, 1); + if (ret < 0) + return ret; + pdata->scl_pin = ret; + } - ret = of_get_gpio(np, 1); - if (ret < 0) - return ret; - pdata->scl_pin = ret; + if (!gpio_is_valid(pdata->sda_pin) || !gpio_is_valid(pdata->scl_pin)) + return -ENODEV; of_property_read_u32(np, "i2c-gpio,delay-us", &pdata->udelay); -- cgit v1.2.3 From d952a0eeba373e5dd2243acae1059d888cc7f3ac Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 26 Jun 2019 15:50:48 +0200 Subject: Regenerate defconfig files Update defconfig files with the following script. for a in arch/*; do arch=$(basename $a) for c in $a/configs/*; do config=$(basename $c) export ARCH=$arch make $config && make savedefconfig && mv defconfig $c done done Signed-off-by: Sascha Hauer --- arch/arm/configs/a9m2410_defconfig | 1 - arch/arm/configs/a9m2440_defconfig | 1 - arch/arm/configs/am335x_mlo_defconfig | 3 +-- arch/arm/configs/archosg9_defconfig | 3 +-- arch/arm/configs/archosg9_xload_defconfig | 2 +- arch/arm/configs/at91sam9m10ihd_defconfig | 1 - arch/arm/configs/at91sam9n12ek_defconfig | 2 +- arch/arm/configs/at91sam9x5ek_defconfig | 3 +-- arch/arm/configs/canon-a1100_defconfig | 2 +- arch/arm/configs/cfa10036_defconfig | 3 +-- arch/arm/configs/chumbyone_defconfig | 1 - arch/arm/configs/cupid_defconfig | 2 +- arch/arm/configs/datamodul-edm-qmx6_defconfig | 2 -- arch/arm/configs/duckbill_defconfig | 4 ---- arch/arm/configs/eukrea_cpuimx27_defconfig | 2 +- arch/arm/configs/freescale-mx21-ads_defconfig | 2 +- arch/arm/configs/freescale-mx23-evk_defconfig | 1 - arch/arm/configs/freescale-mx25-3ds_defconfig | 2 +- arch/arm/configs/freescale-mx27-ads_defconfig | 2 +- arch/arm/configs/freescale-mx28-evk_defconfig | 3 --- arch/arm/configs/freescale-mx35-3ds_defconfig | 2 +- arch/arm/configs/freescale-mx53-smd_defconfig | 1 - arch/arm/configs/friendlyarm_mini2440_defconfig | 3 +-- arch/arm/configs/friendlyarm_mini6410_defconfig | 1 - arch/arm/configs/friendlyarm_tiny6410_defconfig | 1 - arch/arm/configs/haba_knx_lite_defconfig | 2 +- arch/arm/configs/imx233-olinuxino_defconfig | 3 --- arch/arm/configs/imx_defconfig | 1 - arch/arm/configs/imx_v7_defconfig | 2 -- arch/arm/configs/lubbock_defconfig | 2 -- arch/arm/configs/mainstone_defconfig | 2 -- arch/arm/configs/microchip_ksz9477_evb_defconfig | 1 - arch/arm/configs/mioa701_defconfig | 1 - arch/arm/configs/netx_nxdb500_defconfig | 2 +- arch/arm/configs/nhk8815_defconfig | 2 +- arch/arm/configs/omap3430_sdp3430_per_uart_defconfig | 3 +-- arch/arm/configs/omap3530_beagle_defconfig | 1 - arch/arm/configs/omap3530_beagle_per_uart_defconfig | 2 +- arch/arm/configs/omap3530_beagle_xload_defconfig | 2 +- arch/arm/configs/omap3_evm_defconfig | 2 +- arch/arm/configs/omap_defconfig | 2 -- arch/arm/configs/panda_defconfig | 3 +-- arch/arm/configs/panda_xload_defconfig | 2 +- arch/arm/configs/phytec-phycard-omap3-xload_defconfig | 2 +- arch/arm/configs/phytec-phycard-omap3_defconfig | 2 +- arch/arm/configs/phytec-phycard-omap4-xload_defconfig | 2 +- arch/arm/configs/phytec-phycard-omap4_defconfig | 2 +- arch/arm/configs/phytec-phycore-imx31_defconfig | 1 - arch/arm/configs/phytec-phycore-imx35_defconfig | 2 +- arch/arm/configs/phytec-phycore-omap4460-xload-mmc_defconfig | 2 +- arch/arm/configs/phytec-phycore-omap4460-xload-nand_defconfig | 2 +- arch/arm/configs/phytec-phycore-omap4460_defconfig | 2 +- arch/arm/configs/phytec-phycore-pxa270_defconfig | 1 - arch/arm/configs/pm9263_defconfig | 1 - arch/arm/configs/qemu_virt64_defconfig | 2 -- arch/arm/configs/rk3188_defconfig | 2 -- arch/arm/configs/rk3288_defconfig | 3 --- arch/arm/configs/sama5d3_xplained_defconfig | 2 +- arch/arm/configs/sama5d3xek_defconfig | 2 +- arch/arm/configs/sama5d4_xplained_defconfig | 3 +-- arch/arm/configs/sama5d4ek_defconfig | 3 +-- arch/arm/configs/socfpga-arria10_defconfig | 3 --- arch/arm/configs/socfpga_defconfig | 1 - arch/arm/configs/stm32mp1_defconfig | 1 - arch/arm/configs/tqma53_defconfig | 2 -- arch/arm/configs/tx28stk5_defconfig | 3 --- arch/arm/configs/tx53stk5_defconfig | 7 +------ arch/arm/configs/versatilepb_arm1176_defconfig | 1 - arch/arm/configs/versatilepb_defconfig | 1 - arch/arm/configs/vexpress_defconfig | 1 - arch/arm/configs/vincell_defconfig | 2 -- arch/arm/configs/virt2real_defconfig | 2 +- arch/arm/configs/zedboard_defconfig | 1 - arch/arm/configs/zii_vf610_dev_defconfig | 4 ---- arch/arm/configs/zylonite310_defconfig | 2 -- arch/arm/configs/zynqmp_defconfig | 1 - arch/mips/configs/ath79_defconfig | 1 - arch/mips/configs/bcm47xx_defconfig | 1 - arch/mips/configs/gxemul-malta_defconfig | 1 - arch/mips/configs/loongson-ls1b_defconfig | 2 -- arch/mips/configs/qemu-malta_defconfig | 2 -- arch/sandbox/configs/sandbox_defconfig | 4 +--- arch/x86/configs/efi_defconfig | 2 -- arch/x86/configs/generic_defconfig | 1 - 84 files changed, 38 insertions(+), 129 deletions(-) diff --git a/arch/arm/configs/a9m2410_defconfig b/arch/arm/configs/a9m2410_defconfig index 44d1edfc03..ea70a121af 100644 --- a/arch/arm/configs/a9m2410_defconfig +++ b/arch/arm/configs/a9m2410_defconfig @@ -8,7 +8,6 @@ CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_PARTITION=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/a9m2410/env" -CONFIG_DEBUG_INFO=y CONFIG_LONGHELP=y CONFIG_CMD_MEMINFO=y CONFIG_CMD_GO=y diff --git a/arch/arm/configs/a9m2440_defconfig b/arch/arm/configs/a9m2440_defconfig index d1ae580571..5843d29d7f 100644 --- a/arch/arm/configs/a9m2440_defconfig +++ b/arch/arm/configs/a9m2440_defconfig @@ -10,7 +10,6 @@ CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_PARTITION=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/a9m2440/env" -CONFIG_DEBUG_INFO=y CONFIG_LONGHELP=y CONFIG_CMD_MEMINFO=y CONFIG_CMD_GO=y diff --git a/arch/arm/configs/am335x_mlo_defconfig b/arch/arm/configs/am335x_mlo_defconfig index d6909154c4..efe9911050 100644 --- a/arch/arm/configs/am335x_mlo_defconfig +++ b/arch/arm/configs/am335x_mlo_defconfig @@ -1,4 +1,5 @@ CONFIG_ARCH_OMAP=y +CONFIG_BAREBOX_MAX_IMAGE_SIZE=0x1b400 CONFIG_OMAP_BUILD_IFT=y CONFIG_OMAP_SERIALBOOT=y CONFIG_OMAP_MULTI_BOARDS=y @@ -8,7 +9,6 @@ CONFIG_MACH_PHYTEC_SOM_AM335X=y CONFIG_THUMB2_BAREBOX=y # CONFIG_MEMINFO is not set CONFIG_MMU=y -CONFIG_BAREBOX_MAX_IMAGE_SIZE=0x1b400 CONFIG_MALLOC_SIZE=0x0 CONFIG_MALLOC_TLSF=y CONFIG_RELOCATABLE=y @@ -37,7 +37,6 @@ CONFIG_MCI=y CONFIG_MCI_OMAP_HSMMC=y CONFIG_PINCTRL_SINGLE=y CONFIG_BUS_OMAP_GPMC=y -CONFIG_TI_SYSC=y # CONFIG_FS_DEVFS is not set CONFIG_FS_FAT=y CONFIG_FS_FAT_LFN=y diff --git a/arch/arm/configs/archosg9_defconfig b/arch/arm/configs/archosg9_defconfig index 9a71921480..aafd849185 100644 --- a/arch/arm/configs/archosg9_defconfig +++ b/arch/arm/configs/archosg9_defconfig @@ -1,3 +1,4 @@ +CONFIG_TEXT_BASE=0x8f000000 CONFIG_ARCH_OMAP=y CONFIG_OMAP4_USBBOOT=y CONFIG_MACH_ARCHOSG9=y @@ -5,7 +6,6 @@ CONFIG_THUMB2_BAREBOX=y CONFIG_ARM_BOARD_APPEND_ATAG=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_UNWIND=y -CONFIG_TEXT_BASE=0x8f000000 CONFIG_MALLOC_SIZE=0x2000000 CONFIG_MALLOC_TLSF=y CONFIG_KALLSYMS=y @@ -66,7 +66,6 @@ CONFIG_CMD_LED_TRIGGER=y CONFIG_CMD_TIME=y CONFIG_NET=y CONFIG_NET_NETCONSOLE=y -CONFIG_NET_RESOLV=y CONFIG_DRIVER_SERIAL_NS16550=y CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y CONFIG_DRIVER_SERIAL_OMAP4_USBBOOT=y diff --git a/arch/arm/configs/archosg9_xload_defconfig b/arch/arm/configs/archosg9_xload_defconfig index dc13f569dd..27f471cf0b 100644 --- a/arch/arm/configs/archosg9_xload_defconfig +++ b/arch/arm/configs/archosg9_xload_defconfig @@ -1,3 +1,4 @@ +CONFIG_TEXT_BASE=0x40300000 CONFIG_ARCH_OMAP=y CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xC000 # CONFIG_OMAP_GPMC is not set @@ -7,7 +8,6 @@ CONFIG_MACH_ARCHOSG9=y CONFIG_THUMB2_BAREBOX=y # CONFIG_BANNER is not set # CONFIG_MEMINFO is not set -CONFIG_TEXT_BASE=0x40300000 CONFIG_MALLOC_SIZE=0x2000000 CONFIG_SHELL_NONE=y # CONFIG_ERRNO_MESSAGES is not set diff --git a/arch/arm/configs/at91sam9m10ihd_defconfig b/arch/arm/configs/at91sam9m10ihd_defconfig index 006d2acacf..490472f889 100644 --- a/arch/arm/configs/at91sam9m10ihd_defconfig +++ b/arch/arm/configs/at91sam9m10ihd_defconfig @@ -57,7 +57,6 @@ CONFIG_CMD_OFTREE=y CONFIG_NET=y CONFIG_NET_NFS=y CONFIG_NET_NETCONSOLE=y -CONFIG_NET_RESOLV=y CONFIG_DRIVER_NET_MACB=y CONFIG_NET_USB=y CONFIG_NET_USB_ASIX=y diff --git a/arch/arm/configs/at91sam9n12ek_defconfig b/arch/arm/configs/at91sam9n12ek_defconfig index 4ec3e9034c..b7c3a4b1f4 100644 --- a/arch/arm/configs/at91sam9n12ek_defconfig +++ b/arch/arm/configs/at91sam9n12ek_defconfig @@ -1,10 +1,10 @@ +CONFIG_TEXT_BASE=0x26f00000 CONFIG_ARCH_AT91SAM9N12=y CONFIG_BAREBOX_MAX_IMAGE_SIZE=0x40000 CONFIG_AEABI=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_PBL_IMAGE=y CONFIG_MMU=y -CONFIG_TEXT_BASE=0x26f00000 CONFIG_MALLOC_SIZE=0xa00000 CONFIG_EXPERIMENTAL=y CONFIG_MALLOC_TLSF=y diff --git a/arch/arm/configs/at91sam9x5ek_defconfig b/arch/arm/configs/at91sam9x5ek_defconfig index dd427555f9..11d1e4511e 100644 --- a/arch/arm/configs/at91sam9x5ek_defconfig +++ b/arch/arm/configs/at91sam9x5ek_defconfig @@ -75,9 +75,9 @@ CONFIG_USB_STORAGE=y CONFIG_MCI=y CONFIG_MCI_STARTUP=y CONFIG_MCI_ATMEL=y -CONFIG_MFD_SYSCON=y CONFIG_LED=y CONFIG_LED_GPIO=y +CONFIG_LED_GPIO_OF=y CONFIG_LED_TRIGGERS=y CONFIG_EEPROM_AT24=y CONFIG_KEYBOARD_GPIO=y @@ -90,4 +90,3 @@ CONFIG_FS_TFTP=y CONFIG_FS_FAT=y CONFIG_FS_FAT_WRITE=y CONFIG_FS_FAT_LFN=y -CONFIG_LED_GPIO_OF=y diff --git a/arch/arm/configs/canon-a1100_defconfig b/arch/arm/configs/canon-a1100_defconfig index 2994bf3a0c..9887c4c292 100644 --- a/arch/arm/configs/canon-a1100_defconfig +++ b/arch/arm/configs/canon-a1100_defconfig @@ -1,9 +1,9 @@ +CONFIG_TEXT_BASE=0x00300000 CONFIG_BUILTIN_DTB=y CONFIG_ARCH_DIGIC=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_PBL_IMAGE=y CONFIG_IMAGE_COMPRESSION_LZ4=y -CONFIG_TEXT_BASE=0x00300000 CONFIG_MALLOC_SIZE=0x200000 CONFIG_PROMPT="canon-a1100 > " CONFIG_GLOB=y diff --git a/arch/arm/configs/cfa10036_defconfig b/arch/arm/configs/cfa10036_defconfig index 2283658364..5a4e2ab45d 100644 --- a/arch/arm/configs/cfa10036_defconfig +++ b/arch/arm/configs/cfa10036_defconfig @@ -1,10 +1,10 @@ +CONFIG_TEXT_BASE=0x43000000 CONFIG_ARCH_MXS=y CONFIG_ARCH_IMX28=y CONFIG_MACH_CFA10036=y CONFIG_AEABI=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_MMU=y -CONFIG_TEXT_BASE=0x43000000 CONFIG_MALLOC_SIZE=0x800000 CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y @@ -14,7 +14,6 @@ CONFIG_BOOTM_OFTREE=y CONFIG_CONSOLE_ACTIVATE_ALL=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/crystalfontz-cfa10036/env" -CONFIG_DEBUG_INFO=y CONFIG_LONGHELP=y CONFIG_CMD_GO=y CONFIG_CMD_RESET=y diff --git a/arch/arm/configs/chumbyone_defconfig b/arch/arm/configs/chumbyone_defconfig index bb7473fc89..2b38b8cf88 100644 --- a/arch/arm/configs/chumbyone_defconfig +++ b/arch/arm/configs/chumbyone_defconfig @@ -10,7 +10,6 @@ CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/chumby_falconwing/env" -CONFIG_DEBUG_INFO=y CONFIG_LONGHELP=y CONFIG_CMD_MEMINFO=y CONFIG_CMD_GO=y diff --git a/arch/arm/configs/cupid_defconfig b/arch/arm/configs/cupid_defconfig index 13d38885e0..4e6dd96a97 100644 --- a/arch/arm/configs/cupid_defconfig +++ b/arch/arm/configs/cupid_defconfig @@ -1,3 +1,4 @@ +CONFIG_TEXT_BASE=0x87F00000 CONFIG_ARCH_IMX=y CONFIG_CACHE_L2X0=y CONFIG_MACH_GUF_CUPID=y @@ -5,7 +6,6 @@ CONFIG_AEABI=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_UNWIND=y CONFIG_MMU=y -CONFIG_TEXT_BASE=0x87F00000 CONFIG_MALLOC_SIZE=0x1000000 CONFIG_MALLOC_TLSF=y CONFIG_KALLSYMS=y diff --git a/arch/arm/configs/datamodul-edm-qmx6_defconfig b/arch/arm/configs/datamodul-edm-qmx6_defconfig index 1ef656aa14..b828b38e0f 100644 --- a/arch/arm/configs/datamodul-edm-qmx6_defconfig +++ b/arch/arm/configs/datamodul-edm-qmx6_defconfig @@ -8,7 +8,6 @@ CONFIG_THUMB2_BAREBOX=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_UNWIND=y CONFIG_MMU=y -CONFIG_TEXT_BASE=0x0 CONFIG_MALLOC_SIZE=0x0 CONFIG_MALLOC_TLSF=y CONFIG_RELOCATABLE=y @@ -66,7 +65,6 @@ CONFIG_CMD_OF_PROPERTY=y CONFIG_CMD_OFTREE=y CONFIG_CMD_TIME=y CONFIG_NET=y -CONFIG_NET_RESOLV=y CONFIG_OFDEVICE=y CONFIG_OF_BAREBOX_DRIVERS=y CONFIG_DRIVER_NET_FEC_IMX=y diff --git a/arch/arm/configs/duckbill_defconfig b/arch/arm/configs/duckbill_defconfig index 28ea405fe1..c0a3c1753b 100644 --- a/arch/arm/configs/duckbill_defconfig +++ b/arch/arm/configs/duckbill_defconfig @@ -1,12 +1,10 @@ CONFIG_ARCH_MXS=y CONFIG_ARCH_IMX28=y CONFIG_MACH_DUCKBILL=y -CONFIG_ARCH_MXS_USBLOADER=y CONFIG_AEABI=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_UNWIND=y CONFIG_MMU=y -CONFIG_TEXT_BASE=0x0 CONFIG_MALLOC_SIZE=0x0 CONFIG_MALLOC_TLSF=y CONFIG_KALLSYMS=y @@ -21,7 +19,6 @@ CONFIG_BOOTM_INITRD=y CONFIG_BLSPEC=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_RESET_SOURCE=y -CONFIG_DEBUG_INFO=y CONFIG_CMD_DMESG=y CONFIG_LONGHELP=y CONFIG_CMD_IOMEM=y @@ -46,7 +43,6 @@ CONFIG_CMD_MSLEEP=y CONFIG_CMD_READF=y CONFIG_CMD_SLEEP=y CONFIG_CMD_DHCP=y -CONFIG_CMD_HOST=y CONFIG_CMD_MIITOOL=y CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y diff --git a/arch/arm/configs/eukrea_cpuimx27_defconfig b/arch/arm/configs/eukrea_cpuimx27_defconfig index c9672d3692..cb4a709d42 100644 --- a/arch/arm/configs/eukrea_cpuimx27_defconfig +++ b/arch/arm/configs/eukrea_cpuimx27_defconfig @@ -1,8 +1,8 @@ +CONFIG_TEXT_BASE=0xa7f00000 CONFIG_ARCH_IMX=y CONFIG_MACH_EUKREA_CPUIMX27=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_MMU=y -CONFIG_TEXT_BASE=0xa7f00000 CONFIG_MALLOC_SIZE=0x800000 CONFIG_GLOB=y CONFIG_HUSH_FANCY_PROMPT=y diff --git a/arch/arm/configs/freescale-mx21-ads_defconfig b/arch/arm/configs/freescale-mx21-ads_defconfig index e1645bd28b..7dc8cb1426 100644 --- a/arch/arm/configs/freescale-mx21-ads_defconfig +++ b/arch/arm/configs/freescale-mx21-ads_defconfig @@ -1,7 +1,7 @@ +CONFIG_TEXT_BASE=0xc3000000 CONFIG_ARCH_IMX=y CONFIG_MACH_IMX21ADS=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_TEXT_BASE=0xc3000000 CONFIG_MALLOC_SIZE=0x2000000 CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y diff --git a/arch/arm/configs/freescale-mx23-evk_defconfig b/arch/arm/configs/freescale-mx23-evk_defconfig index 3dc8cc46a2..2b12e297b3 100644 --- a/arch/arm/configs/freescale-mx23-evk_defconfig +++ b/arch/arm/configs/freescale-mx23-evk_defconfig @@ -5,7 +5,6 @@ CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_RESET_SOURCE=y -CONFIG_DEBUG_INFO=y CONFIG_LONGHELP=y CONFIG_CMD_RESET=y CONFIG_CMD_PARTITION=y diff --git a/arch/arm/configs/freescale-mx25-3ds_defconfig b/arch/arm/configs/freescale-mx25-3ds_defconfig index 49515f758e..eca608be40 100644 --- a/arch/arm/configs/freescale-mx25-3ds_defconfig +++ b/arch/arm/configs/freescale-mx25-3ds_defconfig @@ -1,10 +1,10 @@ +CONFIG_TEXT_BASE=0x87F00000 CONFIG_ARCH_IMX=y CONFIG_MACH_FREESCALE_MX25_3STACK=y CONFIG_AEABI=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_UNWIND=y CONFIG_MMU=y -CONFIG_TEXT_BASE=0x87F00000 CONFIG_MALLOC_SIZE=0x01000000 CONFIG_MALLOC_TLSF=y CONFIG_KALLSYMS=y diff --git a/arch/arm/configs/freescale-mx27-ads_defconfig b/arch/arm/configs/freescale-mx27-ads_defconfig index e94a47ed6b..ef112d6d5c 100644 --- a/arch/arm/configs/freescale-mx27-ads_defconfig +++ b/arch/arm/configs/freescale-mx27-ads_defconfig @@ -1,7 +1,7 @@ +CONFIG_TEXT_BASE=0xa7f00000 CONFIG_ARCH_IMX=y CONFIG_MACH_IMX27ADS=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_TEXT_BASE=0xa7f00000 CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_BOOTM_SHOW_TYPE=y diff --git a/arch/arm/configs/freescale-mx28-evk_defconfig b/arch/arm/configs/freescale-mx28-evk_defconfig index 6c0bb02891..5f9792317c 100644 --- a/arch/arm/configs/freescale-mx28-evk_defconfig +++ b/arch/arm/configs/freescale-mx28-evk_defconfig @@ -5,7 +5,6 @@ CONFIG_AEABI=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_UNWIND=y CONFIG_MMU=y -CONFIG_TEXT_BASE=0x0 CONFIG_MALLOC_SIZE=0x0 CONFIG_MALLOC_TLSF=y CONFIG_KALLSYMS=y @@ -20,7 +19,6 @@ CONFIG_BOOTM_INITRD=y CONFIG_BLSPEC=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_RESET_SOURCE=y -CONFIG_DEBUG_INFO=y CONFIG_CMD_DMESG=y CONFIG_LONGHELP=y CONFIG_CMD_IOMEM=y @@ -45,7 +43,6 @@ CONFIG_CMD_MSLEEP=y CONFIG_CMD_READF=y CONFIG_CMD_SLEEP=y CONFIG_CMD_DHCP=y -CONFIG_CMD_HOST=y CONFIG_CMD_MIITOOL=y CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y diff --git a/arch/arm/configs/freescale-mx35-3ds_defconfig b/arch/arm/configs/freescale-mx35-3ds_defconfig index 29d2aa8166..5399849a54 100644 --- a/arch/arm/configs/freescale-mx35-3ds_defconfig +++ b/arch/arm/configs/freescale-mx35-3ds_defconfig @@ -1,9 +1,9 @@ +CONFIG_TEXT_BASE=0x87F00000 CONFIG_ARCH_IMX=y CONFIG_MACH_FREESCALE_MX35_3STACK=y CONFIG_AEABI=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_UNWIND=y -CONFIG_TEXT_BASE=0x87F00000 CONFIG_MALLOC_SIZE=0x1000000 CONFIG_MALLOC_TLSF=y CONFIG_KALLSYMS=y diff --git a/arch/arm/configs/freescale-mx53-smd_defconfig b/arch/arm/configs/freescale-mx53-smd_defconfig index 4677e07099..b292b972a3 100644 --- a/arch/arm/configs/freescale-mx53-smd_defconfig +++ b/arch/arm/configs/freescale-mx53-smd_defconfig @@ -19,7 +19,6 @@ CONFIG_BOOTM_INITRD=y CONFIG_BOOTM_OFTREE=y CONFIG_BOOTM_OFTREE_UIMAGE=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y -CONFIG_DEBUG_INFO=y CONFIG_LONGHELP=y CONFIG_CMD_IOMEM=y CONFIG_CMD_MEMINFO=y diff --git a/arch/arm/configs/friendlyarm_mini2440_defconfig b/arch/arm/configs/friendlyarm_mini2440_defconfig index 19a5a4ed3d..21c931ca05 100644 --- a/arch/arm/configs/friendlyarm_mini2440_defconfig +++ b/arch/arm/configs/friendlyarm_mini2440_defconfig @@ -1,16 +1,15 @@ +CONFIG_TEXT_BASE=0x33e00000 CONFIG_ARCH_S3C24xx=y CONFIG_MACH_MINI2440=y CONFIG_MINI2440_VIDEO_N35=y CONFIG_S3C_NAND_BOOT=y CONFIG_AEABI=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_TEXT_BASE=0x33e00000 CONFIG_PROMPT="mini2440:" CONFIG_GLOB=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/friendlyarm-mini2440/env" -CONFIG_DEBUG_INFO=y CONFIG_LONGHELP=y CONFIG_CMD_MEMINFO=y CONFIG_CMD_GO=y diff --git a/arch/arm/configs/friendlyarm_mini6410_defconfig b/arch/arm/configs/friendlyarm_mini6410_defconfig index 209e3f8bf6..8beee6f194 100644 --- a/arch/arm/configs/friendlyarm_mini6410_defconfig +++ b/arch/arm/configs/friendlyarm_mini6410_defconfig @@ -8,7 +8,6 @@ CONFIG_AUTO_COMPLETE=y CONFIG_BOOTM_SHOW_TYPE=y CONFIG_PARTITION=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y -CONFIG_DEBUG_INFO=y CONFIG_LONGHELP=y CONFIG_CMD_MEMINFO=y CONFIG_CMD_GO=y diff --git a/arch/arm/configs/friendlyarm_tiny6410_defconfig b/arch/arm/configs/friendlyarm_tiny6410_defconfig index 85ae78129f..12dbea1317 100644 --- a/arch/arm/configs/friendlyarm_tiny6410_defconfig +++ b/arch/arm/configs/friendlyarm_tiny6410_defconfig @@ -9,7 +9,6 @@ CONFIG_AUTO_COMPLETE=y CONFIG_BOOTM_SHOW_TYPE=y CONFIG_PARTITION=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y -CONFIG_DEBUG_INFO=y CONFIG_LONGHELP=y CONFIG_CMD_MEMINFO=y CONFIG_CMD_GO=y diff --git a/arch/arm/configs/haba_knx_lite_defconfig b/arch/arm/configs/haba_knx_lite_defconfig index 091771580f..233644f24a 100644 --- a/arch/arm/configs/haba_knx_lite_defconfig +++ b/arch/arm/configs/haba_knx_lite_defconfig @@ -1,3 +1,4 @@ +CONFIG_TEXT_BASE=0x27f00000 CONFIG_ARCH_AT91SAM9G20=y CONFIG_MACH_HABA_KNX_LITE=y CONFIG_BAREBOX_MAX_IMAGE_SIZE=0x40000 @@ -5,7 +6,6 @@ CONFIG_AEABI=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_PBL_IMAGE=y CONFIG_MMU=y -CONFIG_TEXT_BASE=0x27f00000 CONFIG_EXPERIMENTAL=y CONFIG_MALLOC_TLSF=y CONFIG_PROMPT="HABA-KNX-LITE:" diff --git a/arch/arm/configs/imx233-olinuxino_defconfig b/arch/arm/configs/imx233-olinuxino_defconfig index 47d485b4e9..15d15a0b9d 100644 --- a/arch/arm/configs/imx233-olinuxino_defconfig +++ b/arch/arm/configs/imx233-olinuxino_defconfig @@ -5,7 +5,6 @@ CONFIG_AEABI=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_UNWIND=y CONFIG_MMU=y -CONFIG_TEXT_BASE=0x0 CONFIG_MALLOC_SIZE=0x1000000 CONFIG_MALLOC_TLSF=y CONFIG_KALLSYMS=y @@ -24,7 +23,6 @@ CONFIG_CONSOLE_ACTIVATE_ALL=y CONFIG_DEFAULT_COMPRESSION_LZO=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_RESET_SOURCE=y -CONFIG_DEBUG_INFO=y CONFIG_CMD_DMESG=y CONFIG_LONGHELP=y CONFIG_CMD_IOMEM=y @@ -54,7 +52,6 @@ CONFIG_CMD_MSLEEP=y CONFIG_CMD_READF=y CONFIG_CMD_SLEEP=y CONFIG_CMD_DHCP=y -CONFIG_CMD_HOST=y CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_CMD_ECHO_E=y diff --git a/arch/arm/configs/imx_defconfig b/arch/arm/configs/imx_defconfig index 7d061cd8a8..4edca607f9 100644 --- a/arch/arm/configs/imx_defconfig +++ b/arch/arm/configs/imx_defconfig @@ -9,7 +9,6 @@ CONFIG_AEABI=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_UNWIND=y CONFIG_MMU=y -CONFIG_TEXT_BASE=0x0 CONFIG_MALLOC_SIZE=0x0 CONFIG_MALLOC_TLSF=y CONFIG_KALLSYMS=y diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig index 2068a6cee4..18c2775687 100644 --- a/arch/arm/configs/imx_v7_defconfig +++ b/arch/arm/configs/imx_v7_defconfig @@ -51,7 +51,6 @@ CONFIG_MMU=y CONFIG_MALLOC_SIZE=0x0 CONFIG_MALLOC_TLSF=y CONFIG_KALLSYMS=y -CONFIG_RELOCATABLE=y CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y @@ -128,7 +127,6 @@ CONFIG_CMD_OFTREE=y CONFIG_CMD_TIME=y CONFIG_NET=y CONFIG_NET_NETCONSOLE=y -CONFIG_NET_RESOLV=y CONFIG_OF_BAREBOX_DRIVERS=y CONFIG_DRIVER_NET_FEC_IMX=y CONFIG_AT803X_PHY=y diff --git a/arch/arm/configs/lubbock_defconfig b/arch/arm/configs/lubbock_defconfig index a45d723879..a3f988aec9 100644 --- a/arch/arm/configs/lubbock_defconfig +++ b/arch/arm/configs/lubbock_defconfig @@ -24,7 +24,6 @@ CONFIG_CONSOLE_ACTIVATE_ALL=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/lubbock/env" CONFIG_RESET_SOURCE=y -CONFIG_DEBUG_INFO=y CONFIG_CMD_DMESG=y CONFIG_LONGHELP=y CONFIG_CMD_IOMEM=y @@ -48,7 +47,6 @@ CONFIG_CMD_LET=y CONFIG_CMD_MSLEEP=y CONFIG_CMD_SLEEP=y CONFIG_CMD_DHCP=y -CONFIG_CMD_HOST=y CONFIG_CMD_MIITOOL=y CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y diff --git a/arch/arm/configs/mainstone_defconfig b/arch/arm/configs/mainstone_defconfig index c8e4f780a6..b685e7fc8d 100644 --- a/arch/arm/configs/mainstone_defconfig +++ b/arch/arm/configs/mainstone_defconfig @@ -25,7 +25,6 @@ CONFIG_CONSOLE_ACTIVATE_ALL=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/mainstone/env" CONFIG_RESET_SOURCE=y -CONFIG_DEBUG_INFO=y CONFIG_CMD_DMESG=y CONFIG_LONGHELP=y CONFIG_CMD_IOMEM=y @@ -51,7 +50,6 @@ CONFIG_CMD_LET=y CONFIG_CMD_MSLEEP=y CONFIG_CMD_SLEEP=y CONFIG_CMD_DHCP=y -CONFIG_CMD_HOST=y CONFIG_CMD_MIITOOL=y CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y diff --git a/arch/arm/configs/microchip_ksz9477_evb_defconfig b/arch/arm/configs/microchip_ksz9477_evb_defconfig index e7d05bd13b..4189b2c039 100644 --- a/arch/arm/configs/microchip_ksz9477_evb_defconfig +++ b/arch/arm/configs/microchip_ksz9477_evb_defconfig @@ -16,7 +16,6 @@ CONFIG_BOOTM_OFTREE=y CONFIG_BOOTM_OFTREE_UIMAGE=y CONFIG_CONSOLE_ALLOW_COLOR=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y -CONFIG_DEBUG_INFO=y CONFIG_CMD_DMESG=y CONFIG_LONGHELP=y CONFIG_CMD_IOMEM=y diff --git a/arch/arm/configs/mioa701_defconfig b/arch/arm/configs/mioa701_defconfig index 99430112ff..a786d1618e 100644 --- a/arch/arm/configs/mioa701_defconfig +++ b/arch/arm/configs/mioa701_defconfig @@ -24,7 +24,6 @@ CONFIG_BOOTM_OFTREE=y CONFIG_FLEXIBLE_BOOTARGS=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/mioa701/env" CONFIG_RESET_SOURCE=y -CONFIG_DEBUG_INFO=y CONFIG_LONGHELP=y CONFIG_CMD_IOMEM=y CONFIG_CMD_MEMINFO=y diff --git a/arch/arm/configs/netx_nxdb500_defconfig b/arch/arm/configs/netx_nxdb500_defconfig index 8755f63e9d..a8b5ffb7ac 100644 --- a/arch/arm/configs/netx_nxdb500_defconfig +++ b/arch/arm/configs/netx_nxdb500_defconfig @@ -1,5 +1,5 @@ -CONFIG_ARCH_NETX=y CONFIG_TEXT_BASE=0x08f80000 +CONFIG_ARCH_NETX=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_PARTITION=y diff --git a/arch/arm/configs/nhk8815_defconfig b/arch/arm/configs/nhk8815_defconfig index 63c777bace..a29e38fad9 100644 --- a/arch/arm/configs/nhk8815_defconfig +++ b/arch/arm/configs/nhk8815_defconfig @@ -1,6 +1,6 @@ +CONFIG_TEXT_BASE=0x03F80000 CONFIG_ARCH_NOMADIK=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_TEXT_BASE=0x03F80000 CONFIG_PROMPT="Nomadik:" CONFIG_GLOB=y CONFIG_HUSH_FANCY_PROMPT=y diff --git a/arch/arm/configs/omap3430_sdp3430_per_uart_defconfig b/arch/arm/configs/omap3430_sdp3430_per_uart_defconfig index 1c30933261..d43355cdf1 100644 --- a/arch/arm/configs/omap3430_sdp3430_per_uart_defconfig +++ b/arch/arm/configs/omap3430_sdp3430_per_uart_defconfig @@ -1,12 +1,11 @@ +CONFIG_TEXT_BASE=0x40200000 CONFIG_ARCH_OMAP=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_TEXT_BASE=0x40200000 CONFIG_PROMPT="X-load 343x> " CONFIG_SHELL_SIMPLE=y # CONFIG_ERRNO_MESSAGES is not set # CONFIG_TIMESTAMP is not set # CONFIG_DEFAULT_ENVIRONMENT is not set -CONFIG_DEBUG_INFO=y # CONFIG_CMD_HELP is not set # CONFIG_CMD_BOOTM is not set CONFIG_CMD_GO=y diff --git a/arch/arm/configs/omap3530_beagle_defconfig b/arch/arm/configs/omap3530_beagle_defconfig index cf79148559..5d09abf615 100644 --- a/arch/arm/configs/omap3530_beagle_defconfig +++ b/arch/arm/configs/omap3530_beagle_defconfig @@ -50,7 +50,6 @@ CONFIG_CMD_MSLEEP=y CONFIG_CMD_READF=y CONFIG_CMD_SLEEP=y CONFIG_CMD_DHCP=y -CONFIG_CMD_HOST=y CONFIG_CMD_MIITOOL=y CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y diff --git a/arch/arm/configs/omap3530_beagle_per_uart_defconfig b/arch/arm/configs/omap3530_beagle_per_uart_defconfig index 9acfe2fc12..e4112b4910 100644 --- a/arch/arm/configs/omap3530_beagle_per_uart_defconfig +++ b/arch/arm/configs/omap3530_beagle_per_uart_defconfig @@ -1,5 +1,5 @@ -CONFIG_ARCH_OMAP=y CONFIG_TEXT_BASE=0x40200000 +CONFIG_ARCH_OMAP=y CONFIG_PROMPT="X-load Beagle>" CONFIG_SHELL_SIMPLE=y # CONFIG_ERRNO_MESSAGES is not set diff --git a/arch/arm/configs/omap3530_beagle_xload_defconfig b/arch/arm/configs/omap3530_beagle_xload_defconfig index 2105c0b9d4..e9484ed852 100644 --- a/arch/arm/configs/omap3530_beagle_xload_defconfig +++ b/arch/arm/configs/omap3530_beagle_xload_defconfig @@ -1,7 +1,6 @@ CONFIG_ARCH_OMAP=y CONFIG_OMAP_BUILD_IFT=y CONFIG_OMAP3_USBBOOT=y -CONFIG_OMAP3_USB_LOADER=y CONFIG_OMAP_MULTI_BOARDS=y CONFIG_MACH_BEAGLE=y CONFIG_THUMB2_BAREBOX=y @@ -37,3 +36,4 @@ CONFIG_MCI_OMAP_HSMMC=y # CONFIG_FS_RAMFS is not set # CONFIG_FS_DEVFS is not set CONFIG_FS_FAT=y +CONFIG_OMAP3_USB_LOADER=y diff --git a/arch/arm/configs/omap3_evm_defconfig b/arch/arm/configs/omap3_evm_defconfig index 7bad6ac582..973acbff68 100644 --- a/arch/arm/configs/omap3_evm_defconfig +++ b/arch/arm/configs/omap3_evm_defconfig @@ -1,7 +1,7 @@ +CONFIG_TEXT_BASE=0x40200000 CONFIG_ARCH_OMAP=y CONFIG_MACH_OMAP3EVM=y CONFIG_AEABI=y -CONFIG_TEXT_BASE=0x40200000 CONFIG_PROMPT="OMAP3_EVM> " CONFIG_SHELL_SIMPLE=y # CONFIG_ERRNO_MESSAGES is not set diff --git a/arch/arm/configs/omap_defconfig b/arch/arm/configs/omap_defconfig index 8615283453..ba90158252 100644 --- a/arch/arm/configs/omap_defconfig +++ b/arch/arm/configs/omap_defconfig @@ -34,7 +34,6 @@ CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_STATE=y CONFIG_BOOTCHOOSER=y CONFIG_RESET_SOURCE=y -CONFIG_DEBUG_INFO=y CONFIG_LONGHELP=y CONFIG_CMD_IOMEM=y CONFIG_CMD_MEMINFO=y @@ -140,7 +139,6 @@ CONFIG_WATCHDOG_OMAP=y CONFIG_GPIO_GENERIC_PLATFORM=y CONFIG_PINCTRL_SINGLE=y CONFIG_BUS_OMAP_GPMC=y -CONFIG_TI_SYSC=y CONFIG_FS_EXT4=y CONFIG_FS_TFTP=y CONFIG_FS_NFS=y diff --git a/arch/arm/configs/panda_defconfig b/arch/arm/configs/panda_defconfig index f4ff5e2cc3..9c1efe168a 100644 --- a/arch/arm/configs/panda_defconfig +++ b/arch/arm/configs/panda_defconfig @@ -1,3 +1,4 @@ +CONFIG_TEXT_BASE=0x8f000000 CONFIG_ARCH_OMAP=y CONFIG_MACH_PANDA=y CONFIG_THUMB2_BAREBOX=y @@ -5,7 +6,6 @@ CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_UNWIND=y CONFIG_PBL_IMAGE=y CONFIG_MMU=y -CONFIG_TEXT_BASE=0x8f000000 CONFIG_MALLOC_SIZE=0x2000000 CONFIG_MALLOC_TLSF=y CONFIG_KALLSYMS=y @@ -61,7 +61,6 @@ CONFIG_CMD_LED_TRIGGER=y CONFIG_CMD_TIME=y CONFIG_NET=y CONFIG_NET_NETCONSOLE=y -CONFIG_NET_RESOLV=y CONFIG_DRIVER_SERIAL_NS16550=y CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y CONFIG_NET_USB=y diff --git a/arch/arm/configs/panda_xload_defconfig b/arch/arm/configs/panda_xload_defconfig index 935dfb5955..e3d87c42dd 100644 --- a/arch/arm/configs/panda_xload_defconfig +++ b/arch/arm/configs/panda_xload_defconfig @@ -1,10 +1,10 @@ +CONFIG_TEXT_BASE=0x40300000 CONFIG_ARCH_OMAP=y # CONFIG_OMAP_GPMC is not set CONFIG_OMAP_BUILD_IFT=y CONFIG_MACH_PANDA=y CONFIG_THUMB2_BAREBOX=y CONFIG_MMU=y -CONFIG_TEXT_BASE=0x40300000 CONFIG_MALLOC_SIZE=0x2000000 CONFIG_PROMPT="barebox> " CONFIG_SHELL_NONE=y diff --git a/arch/arm/configs/phytec-phycard-omap3-xload_defconfig b/arch/arm/configs/phytec-phycard-omap3-xload_defconfig index 0673fde4e0..6eab808f7c 100644 --- a/arch/arm/configs/phytec-phycard-omap3-xload_defconfig +++ b/arch/arm/configs/phytec-phycard-omap3-xload_defconfig @@ -1,3 +1,4 @@ +CONFIG_TEXT_BASE=0x40200000 CONFIG_ARCH_OMAP=y CONFIG_BAREBOX_MAX_IMAGE_SIZE=0x0000f000 CONFIG_OMAP_BUILD_IFT=y @@ -5,7 +6,6 @@ CONFIG_MACH_PCAAL1=y CONFIG_THUMB2_BAREBOX=y # CONFIG_ARM_EXCEPTIONS is not set CONFIG_ENVIRONMENT_VARIABLES=y -CONFIG_TEXT_BASE=0x40200000 CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0x0000f000 CONFIG_STACK_SIZE=0xc00 CONFIG_MALLOC_SIZE=0x1000000 diff --git a/arch/arm/configs/phytec-phycard-omap3_defconfig b/arch/arm/configs/phytec-phycard-omap3_defconfig index bfb7a52f07..6cc1c1e80b 100644 --- a/arch/arm/configs/phytec-phycard-omap3_defconfig +++ b/arch/arm/configs/phytec-phycard-omap3_defconfig @@ -1,7 +1,7 @@ +CONFIG_TEXT_BASE=0x85000000 CONFIG_ARCH_OMAP=y CONFIG_MACH_PCAAL1=y CONFIG_AEABI=y -CONFIG_TEXT_BASE=0x85000000 CONFIG_MALLOC_SIZE=0x1000000 CONFIG_EXPERIMENTAL=y CONFIG_PROMPT="phyCARD-A-L1 >" diff --git a/arch/arm/configs/phytec-phycard-omap4-xload_defconfig b/arch/arm/configs/phytec-phycard-omap4-xload_defconfig index 3bd06c7f49..af3ada6343 100644 --- a/arch/arm/configs/phytec-phycard-omap4-xload_defconfig +++ b/arch/arm/configs/phytec-phycard-omap4-xload_defconfig @@ -1,10 +1,10 @@ +CONFIG_TEXT_BASE=0x40300000 CONFIG_ARCH_OMAP=y CONFIG_OMAP_BUILD_IFT=y CONFIG_MACH_PCAAXL2=y CONFIG_THUMB2_BAREBOX=y # CONFIG_ARM_EXCEPTIONS is not set CONFIG_MMU=y -CONFIG_TEXT_BASE=0x40300000 CONFIG_MALLOC_SIZE=0x2000000 CONFIG_MALLOC_DUMMY=y CONFIG_PROMPT="barebox> " diff --git a/arch/arm/configs/phytec-phycard-omap4_defconfig b/arch/arm/configs/phytec-phycard-omap4_defconfig index 9039307c9d..2f3970725d 100644 --- a/arch/arm/configs/phytec-phycard-omap4_defconfig +++ b/arch/arm/configs/phytec-phycard-omap4_defconfig @@ -1,9 +1,9 @@ +CONFIG_TEXT_BASE=0x8f000000 CONFIG_ARCH_OMAP=y CONFIG_MACH_PCAAXL2=y CONFIG_AEABI=y CONFIG_ARM_UNWIND=y CONFIG_MMU=y -CONFIG_TEXT_BASE=0x8f000000 CONFIG_MALLOC_SIZE=0x2000000 CONFIG_KALLSYMS=y CONFIG_PROMPT="barebox> " diff --git a/arch/arm/configs/phytec-phycore-imx31_defconfig b/arch/arm/configs/phytec-phycore-imx31_defconfig index 858dc3b98e..a6bc28c4c7 100644 --- a/arch/arm/configs/phytec-phycore-imx31_defconfig +++ b/arch/arm/configs/phytec-phycore-imx31_defconfig @@ -62,7 +62,6 @@ CONFIG_CMD_BAREBOX_UPDATE=y CONFIG_CMD_TIME=y CONFIG_NET=y CONFIG_NET_NETCONSOLE=y -CONFIG_NET_RESOLV=y CONFIG_DRIVER_NET_SMC911X=y CONFIG_NET_USB=y CONFIG_NET_USB_ASIX=y diff --git a/arch/arm/configs/phytec-phycore-imx35_defconfig b/arch/arm/configs/phytec-phycore-imx35_defconfig index b1f8c39b6c..2ed2cf9ef3 100644 --- a/arch/arm/configs/phytec-phycore-imx35_defconfig +++ b/arch/arm/configs/phytec-phycore-imx35_defconfig @@ -1,3 +1,4 @@ +CONFIG_TEXT_BASE=0x87E00000 CONFIG_ARCH_IMX=y CONFIG_CACHE_L2X0=y CONFIG_ARCH_IMX_EXTERNAL_BOOT_NAND=y @@ -8,7 +9,6 @@ CONFIG_AEABI=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_UNWIND=y CONFIG_MMU=y -CONFIG_TEXT_BASE=0x87E00000 CONFIG_MALLOC_SIZE=0x1000000 CONFIG_MALLOC_TLSF=y CONFIG_KALLSYMS=y diff --git a/arch/arm/configs/phytec-phycore-omap4460-xload-mmc_defconfig b/arch/arm/configs/phytec-phycore-omap4460-xload-mmc_defconfig index 27bfbff814..61f85c837f 100644 --- a/arch/arm/configs/phytec-phycore-omap4460-xload-mmc_defconfig +++ b/arch/arm/configs/phytec-phycore-omap4460-xload-mmc_defconfig @@ -1,3 +1,4 @@ +CONFIG_TEXT_BASE=0x40300000 CONFIG_ARCH_OMAP=y CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xC000 CONFIG_OMAP_BUILD_IFT=y @@ -6,7 +7,6 @@ CONFIG_THUMB2_BAREBOX=y # CONFIG_ARM_EXCEPTIONS is not set # CONFIG_MEMINFO is not set CONFIG_MMU=y -CONFIG_TEXT_BASE=0x40300000 CONFIG_MALLOC_SIZE=0x2000000 CONFIG_MALLOC_DUMMY=y CONFIG_PROMPT="barebox> " diff --git a/arch/arm/configs/phytec-phycore-omap4460-xload-nand_defconfig b/arch/arm/configs/phytec-phycore-omap4460-xload-nand_defconfig index 46e65b9a4d..77f124b33f 100644 --- a/arch/arm/configs/phytec-phycore-omap4460-xload-nand_defconfig +++ b/arch/arm/configs/phytec-phycore-omap4460-xload-nand_defconfig @@ -1,3 +1,4 @@ +CONFIG_TEXT_BASE=0x40300000 CONFIG_ARCH_OMAP=y CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xC000 CONFIG_OMAP_BUILD_IFT=y @@ -6,7 +7,6 @@ CONFIG_THUMB2_BAREBOX=y # CONFIG_ARM_EXCEPTIONS is not set # CONFIG_MEMINFO is not set CONFIG_MMU=y -CONFIG_TEXT_BASE=0x40300000 CONFIG_MALLOC_SIZE=0x2000000 CONFIG_MALLOC_DUMMY=y CONFIG_PROMPT="barebox> " diff --git a/arch/arm/configs/phytec-phycore-omap4460_defconfig b/arch/arm/configs/phytec-phycore-omap4460_defconfig index 09a07b05b3..e65a76570b 100644 --- a/arch/arm/configs/phytec-phycore-omap4460_defconfig +++ b/arch/arm/configs/phytec-phycore-omap4460_defconfig @@ -1,10 +1,10 @@ +CONFIG_TEXT_BASE=0x8f000000 CONFIG_ARCH_OMAP=y CONFIG_BAREBOX_MAX_IMAGE_SIZE=0x80000 CONFIG_MACH_PCM049=y CONFIG_AEABI=y CONFIG_ARM_UNWIND=y CONFIG_MMU=y -CONFIG_TEXT_BASE=0x8f000000 CONFIG_MALLOC_SIZE=0x2000000 CONFIG_KALLSYMS=y CONFIG_PROMPT="barebox> " diff --git a/arch/arm/configs/phytec-phycore-pxa270_defconfig b/arch/arm/configs/phytec-phycore-pxa270_defconfig index ed1116940b..370902c3c1 100644 --- a/arch/arm/configs/phytec-phycore-pxa270_defconfig +++ b/arch/arm/configs/phytec-phycore-pxa270_defconfig @@ -19,7 +19,6 @@ CONFIG_BOOTM_OFTREE_UIMAGE=y CONFIG_PARTITION=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/phytec-phycore-pxa270/env" -CONFIG_DEBUG_INFO=y CONFIG_LONGHELP=y CONFIG_CMD_IOMEM=y CONFIG_CMD_MEMINFO=y diff --git a/arch/arm/configs/pm9263_defconfig b/arch/arm/configs/pm9263_defconfig index 254d2b96ba..b0eaf9f3e0 100644 --- a/arch/arm/configs/pm9263_defconfig +++ b/arch/arm/configs/pm9263_defconfig @@ -1,5 +1,4 @@ CONFIG_ARCH_AT91SAM9263=y -CONFIG_MACH_PM9263=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_GLOB=y CONFIG_PROMPT_HUSH_PS2="y" diff --git a/arch/arm/configs/qemu_virt64_defconfig b/arch/arm/configs/qemu_virt64_defconfig index 9b7e11ff73..6f9bb9591c 100644 --- a/arch/arm/configs/qemu_virt64_defconfig +++ b/arch/arm/configs/qemu_virt64_defconfig @@ -11,10 +11,8 @@ CONFIG_AUTO_COMPLETE=y CONFIG_MENU=y CONFIG_PARTITION=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y -CONFIG_DEBUG_INFO=y CONFIG_LONGHELP=y CONFIG_CMD_MEMINFO=y -# CONFIG_CMD_BOOTU is not set CONFIG_CMD_GO=y CONFIG_CMD_LOADB=y CONFIG_CMD_RESET=y diff --git a/arch/arm/configs/rk3188_defconfig b/arch/arm/configs/rk3188_defconfig index 78a47a308a..318cd9de42 100644 --- a/arch/arm/configs/rk3188_defconfig +++ b/arch/arm/configs/rk3188_defconfig @@ -6,7 +6,6 @@ CONFIG_ARM_BOARD_APPEND_ATAG=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_UNWIND=y CONFIG_MMU=y -CONFIG_TEXT_BASE=0x0 CONFIG_MALLOC_SIZE=0x0 CONFIG_MALLOC_TLSF=y CONFIG_KALLSYMS=y @@ -54,7 +53,6 @@ CONFIG_CMD_MSLEEP=y CONFIG_CMD_READF=y CONFIG_CMD_SLEEP=y CONFIG_CMD_DHCP=y -CONFIG_CMD_HOST=y CONFIG_CMD_MIITOOL=y CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y diff --git a/arch/arm/configs/rk3288_defconfig b/arch/arm/configs/rk3288_defconfig index 15e6c15a03..156e07fcb1 100644 --- a/arch/arm/configs/rk3288_defconfig +++ b/arch/arm/configs/rk3288_defconfig @@ -24,9 +24,7 @@ CONFIG_CONSOLE_ACTIVATE_NONE=y CONFIG_DEFAULT_COMPRESSION_LZO=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_RESET_SOURCE=y -CONFIG_DEBUG_INFO=y CONFIG_DEBUG_LL=y -CONFIG_DEBUG_ROCKCHIP_UART_PORT=2 CONFIG_CMD_DMESG=y CONFIG_LONGHELP=y CONFIG_CMD_IOMEM=y @@ -56,7 +54,6 @@ CONFIG_CMD_MSLEEP=y CONFIG_CMD_READF=y CONFIG_CMD_SLEEP=y CONFIG_CMD_DHCP=y -CONFIG_CMD_HOST=y CONFIG_CMD_MIITOOL=y CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y diff --git a/arch/arm/configs/sama5d3_xplained_defconfig b/arch/arm/configs/sama5d3_xplained_defconfig index c02ad3cd01..498d5af4b7 100644 --- a/arch/arm/configs/sama5d3_xplained_defconfig +++ b/arch/arm/configs/sama5d3_xplained_defconfig @@ -1,3 +1,4 @@ +CONFIG_TEXT_BASE=0x26f00000 CONFIG_ARCH_SAMA5D3=y CONFIG_MACH_SAMA5D3_XPLAINED=y CONFIG_BAREBOX_MAX_IMAGE_SIZE=0x60000 @@ -5,7 +6,6 @@ CONFIG_AEABI=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_PBL_IMAGE=y CONFIG_MMU=y -CONFIG_TEXT_BASE=0x26f00000 CONFIG_MALLOC_SIZE=0xA00000 CONFIG_EXPERIMENTAL=y CONFIG_MALLOC_TLSF=y diff --git a/arch/arm/configs/sama5d3xek_defconfig b/arch/arm/configs/sama5d3xek_defconfig index 550691c91e..54784cc7ad 100644 --- a/arch/arm/configs/sama5d3xek_defconfig +++ b/arch/arm/configs/sama5d3xek_defconfig @@ -1,10 +1,10 @@ +CONFIG_TEXT_BASE=0x26f00000 CONFIG_ARCH_SAMA5D3=y CONFIG_BAREBOX_MAX_IMAGE_SIZE=0x60000 CONFIG_AEABI=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_PBL_IMAGE=y CONFIG_MMU=y -CONFIG_TEXT_BASE=0x26f00000 CONFIG_MALLOC_SIZE=0xA00000 CONFIG_EXPERIMENTAL=y CONFIG_MALLOC_TLSF=y diff --git a/arch/arm/configs/sama5d4_xplained_defconfig b/arch/arm/configs/sama5d4_xplained_defconfig index 648c813c49..2f232eeac7 100644 --- a/arch/arm/configs/sama5d4_xplained_defconfig +++ b/arch/arm/configs/sama5d4_xplained_defconfig @@ -1,3 +1,4 @@ +CONFIG_TEXT_BASE=0x26f00000 CONFIG_ARCH_SAMA5D4=y CONFIG_MACH_SAMA5D4_XPLAINED=y CONFIG_BAREBOX_MAX_IMAGE_SIZE=0x60000 @@ -5,7 +6,6 @@ CONFIG_AEABI=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_PBL_IMAGE=y CONFIG_MMU=y -CONFIG_TEXT_BASE=0x26f00000 CONFIG_MALLOC_SIZE=0xA00000 CONFIG_EXPERIMENTAL=y CONFIG_MALLOC_TLSF=y @@ -22,7 +22,6 @@ CONFIG_BOOTM_OFTREE_UIMAGE=y CONFIG_CONSOLE_ACTIVATE_ALL=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/sama5d4_xplained/env" -CONFIG_DEBUG_INFO=y # CONFIG_CMD_ARM_CPUINFO is not set CONFIG_LONGHELP=y CONFIG_CMD_MEMINFO=y diff --git a/arch/arm/configs/sama5d4ek_defconfig b/arch/arm/configs/sama5d4ek_defconfig index 2aa38baf87..04f080af0a 100644 --- a/arch/arm/configs/sama5d4ek_defconfig +++ b/arch/arm/configs/sama5d4ek_defconfig @@ -1,10 +1,10 @@ +CONFIG_TEXT_BASE=0x26f00000 CONFIG_ARCH_SAMA5D4=y CONFIG_BAREBOX_MAX_IMAGE_SIZE=0x60000 CONFIG_AEABI=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_PBL_IMAGE=y CONFIG_MMU=y -CONFIG_TEXT_BASE=0x26f00000 CONFIG_MALLOC_SIZE=0xA00000 CONFIG_EXPERIMENTAL=y CONFIG_MALLOC_TLSF=y @@ -21,7 +21,6 @@ CONFIG_BOOTM_OFTREE_UIMAGE=y CONFIG_CONSOLE_ACTIVATE_ALL=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/sama5d4ek/env" -CONFIG_DEBUG_INFO=y # CONFIG_CMD_ARM_CPUINFO is not set CONFIG_LONGHELP=y CONFIG_CMD_MEMINFO=y diff --git a/arch/arm/configs/socfpga-arria10_defconfig b/arch/arm/configs/socfpga-arria10_defconfig index 53e932d64b..ae420c1dd2 100644 --- a/arch/arm/configs/socfpga-arria10_defconfig +++ b/arch/arm/configs/socfpga-arria10_defconfig @@ -3,7 +3,6 @@ CONFIG_MACH_SOCFPGA_REFLEX_ACHILLES=y CONFIG_AEABI=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_UNWIND=y -CONFIG_TEXT_BASE=0xffe00000 CONFIG_MALLOC_SIZE=0x0 CONFIG_MALLOC_TLSF=y CONFIG_KALLSYMS=y @@ -21,7 +20,6 @@ CONFIG_DEFAULT_COMPRESSION_LZO=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_POLLER=y CONFIG_STATE=y -CONFIG_DEBUG_INFO=y CONFIG_LONGHELP=y CONFIG_CMD_IOMEM=y CONFIG_CMD_MEMINFO=y @@ -65,7 +63,6 @@ CONFIG_CMD_TIME=y CONFIG_CMD_STATE=y CONFIG_NET=y CONFIG_NET_NETCONSOLE=y -CONFIG_NET_RESOLV=y CONFIG_OF_BAREBOX_DRIVERS=y CONFIG_OF_BAREBOX_ENV_IN_FS=y CONFIG_DRIVER_SERIAL_NS16550=y diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig index d9688ca29c..2509ad0b42 100644 --- a/arch/arm/configs/socfpga_defconfig +++ b/arch/arm/configs/socfpga_defconfig @@ -68,7 +68,6 @@ CONFIG_CMD_OFTREE=y CONFIG_CMD_TIME=y CONFIG_NET=y CONFIG_NET_NETCONSOLE=y -CONFIG_NET_RESOLV=y CONFIG_OF_BAREBOX_DRIVERS=y CONFIG_OF_BAREBOX_ENV_IN_FS=y CONFIG_DRIVER_SERIAL_NS16550=y diff --git a/arch/arm/configs/stm32mp1_defconfig b/arch/arm/configs/stm32mp1_defconfig index 2922ce3632..0afbbff7fd 100644 --- a/arch/arm/configs/stm32mp1_defconfig +++ b/arch/arm/configs/stm32mp1_defconfig @@ -80,7 +80,6 @@ CONFIG_NET=y CONFIG_NET_NETCONSOLE=y CONFIG_OFDEVICE=y CONFIG_OF_BAREBOX_DRIVERS=y -CONFIG_DRIVER_SERIAL_STM32=y CONFIG_DRIVER_NET_DESIGNWARE=y CONFIG_DRIVER_NET_DESIGNWARE_GENERIC=y CONFIG_AT803X_PHY=y diff --git a/arch/arm/configs/tqma53_defconfig b/arch/arm/configs/tqma53_defconfig index f2025c8326..3b0dc306be 100644 --- a/arch/arm/configs/tqma53_defconfig +++ b/arch/arm/configs/tqma53_defconfig @@ -7,7 +7,6 @@ CONFIG_AEABI=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_UNWIND=y CONFIG_MMU=y -CONFIG_TEXT_BASE=0x0 CONFIG_MALLOC_SIZE=0x0 CONFIG_MALLOC_TLSF=y CONFIG_KALLSYMS=y @@ -23,7 +22,6 @@ CONFIG_BOOTM_OFTREE_UIMAGE=y CONFIG_BLSPEC=y CONFIG_CONSOLE_ACTIVATE_NONE=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y -CONFIG_DEBUG_INFO=y CONFIG_LONGHELP=y CONFIG_CMD_IOMEM=y CONFIG_CMD_MEMINFO=y diff --git a/arch/arm/configs/tx28stk5_defconfig b/arch/arm/configs/tx28stk5_defconfig index 504501524a..c712975fd9 100644 --- a/arch/arm/configs/tx28stk5_defconfig +++ b/arch/arm/configs/tx28stk5_defconfig @@ -4,7 +4,6 @@ CONFIG_AEABI=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_UNWIND=y CONFIG_MMU=y -CONFIG_TEXT_BASE=0x0 CONFIG_MALLOC_SIZE=0x0 CONFIG_MALLOC_TLSF=y CONFIG_KALLSYMS=y @@ -24,7 +23,6 @@ CONFIG_PBL_CONSOLE=y CONFIG_DEFAULT_COMPRESSION_LZO=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_RESET_SOURCE=y -CONFIG_DEBUG_INFO=y CONFIG_DEBUG_LL=y CONFIG_CMD_DMESG=y CONFIG_LONGHELP=y @@ -54,7 +52,6 @@ CONFIG_CMD_MSLEEP=y CONFIG_CMD_READF=y CONFIG_CMD_SLEEP=y CONFIG_CMD_DHCP=y -CONFIG_CMD_HOST=y CONFIG_CMD_MIITOOL=y CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y diff --git a/arch/arm/configs/tx53stk5_defconfig b/arch/arm/configs/tx53stk5_defconfig index 8a9390e89f..7c3c51defe 100644 --- a/arch/arm/configs/tx53stk5_defconfig +++ b/arch/arm/configs/tx53stk5_defconfig @@ -1,14 +1,10 @@ +CONFIG_TEXT_BASE=0x87f00000 CONFIG_ARCH_IMX=y -CONFIG_MACH_TX53=y -CONFIG_TX53_REV_XX30=y CONFIG_IMX_IIM=y -CONFIG_THUMB2_BAREBOX=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_ARM_UNWIND=y CONFIG_PBL_IMAGE=y CONFIG_IMAGE_COMPRESSION_GZIP=y CONFIG_MMU=y -CONFIG_TEXT_BASE=0x87f00000 CONFIG_MALLOC_SIZE=0x2000000 CONFIG_MALLOC_TLSF=y CONFIG_KALLSYMS=y @@ -53,7 +49,6 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_LED=y CONFIG_CMD_TIME=y CONFIG_NET=y -CONFIG_DRIVER_NET_FEC_IMX=y CONFIG_MTD=y CONFIG_NAND=y CONFIG_NAND_IMX=y diff --git a/arch/arm/configs/versatilepb_arm1176_defconfig b/arch/arm/configs/versatilepb_arm1176_defconfig index f51689fa27..284fbd1150 100644 --- a/arch/arm/configs/versatilepb_arm1176_defconfig +++ b/arch/arm/configs/versatilepb_arm1176_defconfig @@ -62,7 +62,6 @@ CONFIG_CMD_OFTREE=y CONFIG_NET=y CONFIG_NET_NFS=y CONFIG_NET_NETCONSOLE=y -CONFIG_NET_RESOLV=y CONFIG_OFDEVICE=y CONFIG_OF_BAREBOX_DRIVERS=y CONFIG_SERIAL_AMBA_PL011=y diff --git a/arch/arm/configs/versatilepb_defconfig b/arch/arm/configs/versatilepb_defconfig index 56425db961..61b9ff1c38 100644 --- a/arch/arm/configs/versatilepb_defconfig +++ b/arch/arm/configs/versatilepb_defconfig @@ -60,7 +60,6 @@ CONFIG_CMD_OFTREE=y CONFIG_NET=y CONFIG_NET_NFS=y CONFIG_NET_NETCONSOLE=y -CONFIG_NET_RESOLV=y CONFIG_OFDEVICE=y CONFIG_OF_BAREBOX_DRIVERS=y CONFIG_SERIAL_AMBA_PL011=y diff --git a/arch/arm/configs/vexpress_defconfig b/arch/arm/configs/vexpress_defconfig index f6a57de75c..149ba17321 100644 --- a/arch/arm/configs/vexpress_defconfig +++ b/arch/arm/configs/vexpress_defconfig @@ -46,7 +46,6 @@ CONFIG_CMD_OFTREE=y CONFIG_NET=y CONFIG_NET_NFS=y CONFIG_NET_NETCONSOLE=y -CONFIG_NET_RESOLV=y CONFIG_OF_BAREBOX_DRIVERS=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_DRIVER_NET_SMC91111=y diff --git a/arch/arm/configs/vincell_defconfig b/arch/arm/configs/vincell_defconfig index 1480a942b0..a09161df44 100644 --- a/arch/arm/configs/vincell_defconfig +++ b/arch/arm/configs/vincell_defconfig @@ -8,7 +8,6 @@ CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_UNWIND=y CONFIG_IMAGE_COMPRESSION_XZKERN=y CONFIG_MMU=y -CONFIG_TEXT_BASE=0x0 CONFIG_MALLOC_SIZE=0x0 CONFIG_MALLOC_TLSF=y CONFIG_RELOCATABLE=y @@ -77,7 +76,6 @@ CONFIG_CMD_TIME=y CONFIG_CMD_STATE=y CONFIG_NET=y CONFIG_NET_NETCONSOLE=y -CONFIG_NET_RESOLV=y CONFIG_OFDEVICE=y CONFIG_OF_BAREBOX_DRIVERS=y CONFIG_DRIVER_NET_FEC_IMX=y diff --git a/arch/arm/configs/virt2real_defconfig b/arch/arm/configs/virt2real_defconfig index b1b00c347e..4fb61cbd0c 100644 --- a/arch/arm/configs/virt2real_defconfig +++ b/arch/arm/configs/virt2real_defconfig @@ -1,8 +1,8 @@ +CONFIG_TEXT_BASE=0x82300000 CONFIG_BUILTIN_DTB=y CONFIG_ARCH_DAVINCI=y CONFIG_AEABI=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_TEXT_BASE=0x82300000 CONFIG_MALLOC_SIZE=0x200000 CONFIG_MALLOC_TLSF=y CONFIG_PROMPT="virt2real: " diff --git a/arch/arm/configs/zedboard_defconfig b/arch/arm/configs/zedboard_defconfig index bcd604f341..cc03368751 100644 --- a/arch/arm/configs/zedboard_defconfig +++ b/arch/arm/configs/zedboard_defconfig @@ -17,7 +17,6 @@ CONFIG_BOOTM_INITRD=y CONFIG_BOOTM_OFTREE=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/avnet-zedboard/env" -CONFIG_DEBUG_INFO=y CONFIG_DEBUG_LL=y CONFIG_LONGHELP=y CONFIG_CMD_MEMINFO=y diff --git a/arch/arm/configs/zii_vf610_dev_defconfig b/arch/arm/configs/zii_vf610_dev_defconfig index ee77f40002..c9aa60c33e 100644 --- a/arch/arm/configs/zii_vf610_dev_defconfig +++ b/arch/arm/configs/zii_vf610_dev_defconfig @@ -5,13 +5,11 @@ CONFIG_THUMB2_BAREBOX=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_UNWIND=y CONFIG_MMU=y -CONFIG_TEXT_BASE=0x0 CONFIG_MALLOC_SIZE=0x0 CONFIG_MALLOC_TLSF=y CONFIG_KALLSYMS=y CONFIG_RELOCATABLE=y CONFIG_HUSH_FANCY_PROMPT=y -CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_MENU=y CONFIG_BOOTM_SHOW_TYPE=y @@ -84,8 +82,6 @@ CONFIG_CMD_OFTREE=y CONFIG_CMD_TIME=y CONFIG_NET=y CONFIG_NET_NETCONSOLE=y -CONFIG_NET_RESOLV=y -CONFIG_OFDEVICE=y CONFIG_OF_BAREBOX_DRIVERS=y CONFIG_AIODEV=y CONFIG_LM75=y diff --git a/arch/arm/configs/zylonite310_defconfig b/arch/arm/configs/zylonite310_defconfig index f1cd92af84..a8ac92040a 100644 --- a/arch/arm/configs/zylonite310_defconfig +++ b/arch/arm/configs/zylonite310_defconfig @@ -26,7 +26,6 @@ CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/zylonite/env" CONFIG_RESET_SOURCE=y CONFIG_DEFAULT_LOGLEVEL=8 -CONFIG_DEBUG_INFO=y CONFIG_CMD_DMESG=y CONFIG_LONGHELP=y CONFIG_CMD_IOMEM=y @@ -51,7 +50,6 @@ CONFIG_CMD_LET=y CONFIG_CMD_MSLEEP=y CONFIG_CMD_SLEEP=y CONFIG_CMD_DHCP=y -CONFIG_CMD_HOST=y CONFIG_CMD_MIITOOL=y CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y diff --git a/arch/arm/configs/zynqmp_defconfig b/arch/arm/configs/zynqmp_defconfig index a358a5046e..4dea9647fe 100644 --- a/arch/arm/configs/zynqmp_defconfig +++ b/arch/arm/configs/zynqmp_defconfig @@ -33,7 +33,6 @@ CONFIG_CMD_TIMEOUT=y CONFIG_CMD_CLK=y CONFIG_CMD_OFTREE=y CONFIG_CMD_TIME=y -CONFIG_DRIVER_NET_MACB=y CONFIG_DRIVER_SERIAL_CADENCE=y # CONFIG_SPI is not set CONFIG_DIGEST=y diff --git a/arch/mips/configs/ath79_defconfig b/arch/mips/configs/ath79_defconfig index 3f33a720b1..83d22e4e1c 100644 --- a/arch/mips/configs/ath79_defconfig +++ b/arch/mips/configs/ath79_defconfig @@ -35,7 +35,6 @@ CONFIG_CMD_MSLEEP=y CONFIG_CMD_READF=y CONFIG_CMD_SLEEP=y CONFIG_CMD_DHCP=y -CONFIG_CMD_HOST=y CONFIG_CMD_MIITOOL=y CONFIG_CMD_PING=y CONFIG_CMD_ECHO_E=y diff --git a/arch/mips/configs/bcm47xx_defconfig b/arch/mips/configs/bcm47xx_defconfig index 04833ef2e0..0cd0e9e650 100644 --- a/arch/mips/configs/bcm47xx_defconfig +++ b/arch/mips/configs/bcm47xx_defconfig @@ -9,7 +9,6 @@ CONFIG_MENU=y CONFIG_BOOTM_SHOW_TYPE=y CONFIG_PARTITION=y # CONFIG_DEFAULT_ENVIRONMENT is not set -CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_POLLER=y CONFIG_LONGHELP=y CONFIG_CMD_IOMEM=y diff --git a/arch/mips/configs/gxemul-malta_defconfig b/arch/mips/configs/gxemul-malta_defconfig index 75fc401680..61e4e29016 100644 --- a/arch/mips/configs/gxemul-malta_defconfig +++ b/arch/mips/configs/gxemul-malta_defconfig @@ -2,7 +2,6 @@ CONFIG_BUILTIN_DTB=y CONFIG_BUILTIN_DTB_NAME="qemu-malta" CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPU_MIPS32_R1=y -CONFIG_PBL_IMAGE=y CONFIG_STACK_SIZE=0x7000 CONFIG_EXPERIMENTAL=y CONFIG_BAUDRATE=38400 diff --git a/arch/mips/configs/loongson-ls1b_defconfig b/arch/mips/configs/loongson-ls1b_defconfig index 25444e373e..92824e0f0f 100644 --- a/arch/mips/configs/loongson-ls1b_defconfig +++ b/arch/mips/configs/loongson-ls1b_defconfig @@ -1,7 +1,6 @@ CONFIG_BUILTIN_DTB=y CONFIG_BUILTIN_DTB_NAME="loongson-ls1b" CONFIG_MACH_MIPS_LOONGSON=y -CONFIG_PBL_IMAGE=y CONFIG_STACK_SIZE=0x7000 CONFIG_EXPERIMENTAL=y CONFIG_MALLOC_TLSF=y @@ -14,7 +13,6 @@ CONFIG_PARTITION=y # CONFIG_DEFAULT_ENVIRONMENT is not set CONFIG_POLLER=y CONFIG_RESET_SOURCE=y -CONFIG_DEBUG_INFO=y CONFIG_LONGHELP=y CONFIG_CMD_IOMEM=y CONFIG_CMD_MEMINFO=y diff --git a/arch/mips/configs/qemu-malta_defconfig b/arch/mips/configs/qemu-malta_defconfig index 69c7b0b10a..2465c0260d 100644 --- a/arch/mips/configs/qemu-malta_defconfig +++ b/arch/mips/configs/qemu-malta_defconfig @@ -13,7 +13,6 @@ CONFIG_CONSOLE_ALLOW_COLOR=y CONFIG_PARTITION=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_POLLER=y -CONFIG_DEBUG_INFO=y CONFIG_CMD_DMESG=y CONFIG_LONGHELP=y CONFIG_CMD_IOMEM=y @@ -58,7 +57,6 @@ CONFIG_CMD_TIME=y CONFIG_NET=y CONFIG_NET_NFS=y CONFIG_NET_NETCONSOLE=y -CONFIG_NET_RESOLV=y CONFIG_OFDEVICE=y CONFIG_OF_BAREBOX_DRIVERS=y CONFIG_DRIVER_NET_RTL8139=y diff --git a/arch/sandbox/configs/sandbox_defconfig b/arch/sandbox/configs/sandbox_defconfig index 68fe40f40a..c343f053fa 100644 --- a/arch/sandbox/configs/sandbox_defconfig +++ b/arch/sandbox/configs/sandbox_defconfig @@ -6,7 +6,6 @@ CONFIG_PARTITION=y CONFIG_DEFAULT_COMPRESSION_GZIP=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/sandbox/board/env" -CONFIG_DEBUG_INFO=y CONFIG_CMD_DMESG=y CONFIG_LONGHELP=y CONFIG_CMD_IMD=y @@ -36,7 +35,6 @@ CONFIG_CMD_MSLEEP=y CONFIG_CMD_READF=y CONFIG_CMD_SLEEP=y CONFIG_CMD_DHCP=y -CONFIG_CMD_HOST=y CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_CMD_ECHO_E=y @@ -52,10 +50,10 @@ CONFIG_CMD_CRC_CMP=y CONFIG_CMD_MM=y CONFIG_CMD_DETECT=y CONFIG_CMD_FLASH=y -CONFIG_CMD_POWEROFF=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_LED=y +CONFIG_CMD_POWEROFF=y CONFIG_CMD_SPI=y CONFIG_CMD_LED_TRIGGER=y CONFIG_CMD_2048=y diff --git a/arch/x86/configs/efi_defconfig b/arch/x86/configs/efi_defconfig index f489770eba..47842d10af 100644 --- a/arch/x86/configs/efi_defconfig +++ b/arch/x86/configs/efi_defconfig @@ -16,7 +16,6 @@ CONFIG_PARTITION_DISK_EFI=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_POLLER=y CONFIG_STATE=y -CONFIG_DEBUG_INFO=y CONFIG_DEBUG_LL=y CONFIG_LONGHELP=y CONFIG_CMD_IOMEM=y @@ -41,7 +40,6 @@ CONFIG_CMD_MSLEEP=y CONFIG_CMD_READF=y CONFIG_CMD_SLEEP=y CONFIG_CMD_DHCP=y -CONFIG_CMD_HOST=y CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_CMD_ECHO_E=y diff --git a/arch/x86/configs/generic_defconfig b/arch/x86/configs/generic_defconfig index 3b94e02a7e..4620280136 100644 --- a/arch/x86/configs/generic_defconfig +++ b/arch/x86/configs/generic_defconfig @@ -7,7 +7,6 @@ CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_PARTITION=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/x86/boards/x86_generic/env" -CONFIG_DEBUG_INFO=y CONFIG_LONGHELP=y CONFIG_CMD_MEMINFO=y # CONFIG_CMD_BOOTM is not set -- cgit v1.2.3 From c37cc2d725a496551113f4ebb1d116823eb0dbd1 Mon Sep 17 00:00:00 2001 From: Oleksij Rempel Date: Mon, 24 Jun 2019 12:00:42 +0200 Subject: add CONFIG_PBL_BREAK option With this option barebox will be build with breakpoint instruction in early pbl stage. Signed-off-by: Oleksij Rempel Signed-off-by: Sascha Hauer --- arch/arm/cpu/common.c | 13 +++++++++++++ arch/arm/cpu/start.c | 2 ++ arch/arm/include/asm/barebox-arm-head.h | 7 +++++++ arch/arm/include/asm/barebox-arm.h | 1 + common/Kconfig | 8 ++++++++ 5 files changed, 31 insertions(+) diff --git a/arch/arm/cpu/common.c b/arch/arm/cpu/common.c index 821cafbf26..4a2b6734db 100644 --- a/arch/arm/cpu/common.c +++ b/arch/arm/cpu/common.c @@ -46,6 +46,19 @@ void sync_caches_for_execution(void) #define R_ARM_RELATIVE 23 #define R_AARCH64_RELATIVE 1027 +void pbl_barebox_break(void) +{ + __asm__ __volatile__ ( +#ifdef CONFIG_PBL_BREAK + "bkpt #17\n" + "nop\n" +#else + "nop\n" + "nop\n" +#endif + ); +} + /* * relocate binary to the currently running address */ diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c index 1b1659b315..c97b2770c4 100644 --- a/arch/arm/cpu/start.c +++ b/arch/arm/cpu/start.c @@ -168,6 +168,8 @@ __noreturn void barebox_non_pbl_start(unsigned long membase, barrier(); + pbl_barebox_break(); + pr_debug("memory at 0x%08lx, size 0x%08lx\n", membase, memsize); arm_endmem = endmem; diff --git a/arch/arm/include/asm/barebox-arm-head.h b/arch/arm/include/asm/barebox-arm-head.h index 5c6205c815..83a22c4d94 100644 --- a/arch/arm/include/asm/barebox-arm-head.h +++ b/arch/arm/include/asm/barebox-arm-head.h @@ -64,6 +64,13 @@ static inline void __barebox_arm_head(void) ".word 0x55555555\n" ".endr\n" "2:\n" +#ifdef CONFIG_PBL_BREAK + "bkpt #17\n" + "nop\n" +#else + "nop\n" + "nop\n" +#endif ); } static inline void barebox_arm_head(void) diff --git a/arch/arm/include/asm/barebox-arm.h b/arch/arm/include/asm/barebox-arm.h index a1e6bff3a3..9840482b23 100644 --- a/arch/arm/include/asm/barebox-arm.h +++ b/arch/arm/include/asm/barebox-arm.h @@ -55,6 +55,7 @@ static inline unsigned long global_variable_offset(void) } void setup_c(void); +void pbl_barebox_break(void); void relocate_to_current_adr(void); void relocate_to_adr(unsigned long target); void __noreturn barebox_arm_entry(unsigned long membase, unsigned long memsize, void *boarddata); diff --git a/common/Kconfig b/common/Kconfig index f5777a304c..8aad5baecd 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -1287,6 +1287,14 @@ config DEBUG_INITCALLS help If enabled this will print initcall traces. + +config PBL_BREAK + bool "Execute software break on pbl start" + depends on ARM + help + If this enabled, barebox will be compiled with BKPT instruction + on early pbl init. This option should be used only with JTAG debugger! + endmenu config HAS_DEBUG_LL -- cgit v1.2.3 From d71573a006a2fc2b83c076c556b88166f4e3dec3 Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Mon, 24 Jun 2019 12:00:43 +0200 Subject: add gdb helper scripts to load barebox symbols Add a gdb script with two helper functions which use the new pbl_barebox_break symbol to calculate the current barebox load address on the device and loads a barebox ELF file to this address. Signed-off-by: Rouven Czerwinski Signed-off-by: Sascha Hauer --- Documentation/user/debugging.rst | 21 +++++++++++++ Documentation/user/user-manual.rst | 1 + scripts/gdb/helper.py | 60 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+) create mode 100644 Documentation/user/debugging.rst create mode 100644 scripts/gdb/helper.py diff --git a/Documentation/user/debugging.rst b/Documentation/user/debugging.rst new file mode 100644 index 0000000000..15cb439043 --- /dev/null +++ b/Documentation/user/debugging.rst @@ -0,0 +1,21 @@ +Debugging with OpenOCD +====================== + +Barebox can be configured to break on prebootloader and main barebox entry. This +breakpoint can not be resumed and will stop the board to allow the user to +attach a JTAG debugger with OpenOCD. Additionally, barebox provides helper +scripts to load the symbols from the ELF binaries. +The python scripts require `pyelftools`. +To load the scripts into your gdb session, run the following command in the +barebox directory: + +.. code-block:: none + + (gdb) source scripts/gdb/helper.py + +This makes two new commands available in gdb, `bb-load-symbols` and +`bb-skip-break`. `bb-load-symbols` can load either the main `barebox` file or +one of the .pbl files in the image directories. The board needs to be stopped in +either the prebootloader or main barebox breakpoint, and gdb needs to be +connected to OpenOCD. To continue booting the board, `bb-skip-break` jumps over +the breakpoint and continues the barebox execution. diff --git a/Documentation/user/user-manual.rst b/Documentation/user/user-manual.rst index 516b760b1b..f04981c3f0 100644 --- a/Documentation/user/user-manual.rst +++ b/Documentation/user/user-manual.rst @@ -33,6 +33,7 @@ Contents: system-reset state random + debugging * :ref:`search` * :ref:`genindex` diff --git a/scripts/gdb/helper.py b/scripts/gdb/helper.py new file mode 100644 index 0000000000..4041789890 --- /dev/null +++ b/scripts/gdb/helper.py @@ -0,0 +1,60 @@ +#!/usr/bin/env python + +import gdb + +try: + from elftools.elf.elffile import ELFFile + from elftools.common.exceptions import ELFError +except ImportError: + gdb.write("The barebox helper requires pyelftools\n", gdb.STDERR) + exit(1) + + +class BBSymbols(gdb.Command): + + def __init__(self): + super(BBSymbols, self).__init__("bb-load-symbols", gdb.COMMAND_FILES, + gdb.COMPLETE_FILENAME) + + def invoke(self, argument, from_tty): + path = argument + f = open(path, 'rb') + + try: + elf = ELFFile(f) + except ELFError: + gdb.write("Selected file is not an ELF file\n", gdb.STDERR) + return + + section = elf.get_section_by_name(".symtab") + if section is None: + gdb.write("Section .symtab not found\n", gdb.STDERR) + return + symbol = section.get_symbol_by_name("pbl_barebox_break") + if not symbol: + gdb.write("Symbol pbl_barebox_break in section {} in file {} not found\n" + .format(section.name, self.path), gdb.STDERR) + return + symbol = symbol[0] + pc = gdb.parse_and_eval("$pc") + symbol_address = int(symbol.entry.st_value) + address = int(pc) - symbol_address + 1 + gdb.execute("symbol-file") + gdb.execute("add-symbol-file {} {}".format(path, address)) + + +BBSymbols() + + +class BBSkip(gdb.Command): + + def __init__(self): + super(BBSkip, self).__init__("bb-skip-break", gdb.COMMAND_BREAKPOINTS) + + def invoke(self, arg, from_tty): + pc = gdb.parse_and_eval("$pc") + nop_address = int(pc) + 2 + gdb.execute("jump *{}".format(nop_address)) + + +BBSkip() -- cgit v1.2.3 From 6e465b62125af759c9e90f86ece45f136242e72d Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Fri, 28 Jun 2019 17:37:27 +0200 Subject: mfd: syscon: add syscon_regmap_lookup_by_phandle() This function is handy when syscon is passed as phandle to device_node property. Signed-off-by: Marcin Niestroj Signed-off-by: Sascha Hauer --- drivers/mfd/syscon.c | 19 +++++++++++++++++++ include/mfd/syscon.h | 9 +++++++++ 2 files changed, 28 insertions(+) diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c index b1ff1b1eac..8099419378 100644 --- a/drivers/mfd/syscon.c +++ b/drivers/mfd/syscon.c @@ -174,6 +174,25 @@ struct regmap *syscon_regmap_lookup_by_compatible(const char *s) return regmap; } +struct regmap *syscon_regmap_lookup_by_phandle(struct device_node *np, + const char *property) +{ + struct device_node *syscon_np; + struct regmap *regmap; + + if (property) + syscon_np = of_parse_phandle(np, property, 0); + else + syscon_np = np; + + if (!syscon_np) + return ERR_PTR(-ENODEV); + + regmap = syscon_node_to_regmap(syscon_np); + + return regmap; +} + static int syscon_probe(struct device_d *dev) { struct syscon *syscon; diff --git a/include/mfd/syscon.h b/include/mfd/syscon.h index 902f9fa2f3..ac33f2d347 100644 --- a/include/mfd/syscon.h +++ b/include/mfd/syscon.h @@ -22,6 +22,9 @@ void __iomem *syscon_base_lookup_by_phandle (struct device_node *np, const char *property); struct regmap *syscon_node_to_regmap(struct device_node *np); struct regmap *syscon_regmap_lookup_by_compatible(const char *s); +extern struct regmap *syscon_regmap_lookup_by_phandle( + struct device_node *np, + const char *property); #else static inline void __iomem *syscon_base_lookup_by_pdevname(const char *s) { @@ -42,6 +45,12 @@ static inline struct regmap *syscon_regmap_lookup_by_compatible(const char *s) { return ERR_PTR(-ENOSYS); } +static inline struct regmap *syscon_regmap_lookup_by_phandle( + struct device_node *np, + const char *property) +{ + return ERR_PTR(-ENOSYS); +} #endif #endif -- cgit v1.2.3 From 7184fcfac6a4940fb29908a3b0133e710f78e6df Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Fri, 28 Jun 2019 17:56:43 +0200 Subject: serial: ns16550: support reg-offset device-tree property Some SoC have serial registers with a fixed offset to the map base. Support them by respecting 'reg-offset' device-tree property. Signed-off-by: Marcin Niestroj Signed-off-by: Sascha Hauer --- drivers/serial/serial_ns16550.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c index 4c84d27bdc..3edeb0dcbe 100644 --- a/drivers/serial/serial_ns16550.c +++ b/drivers/serial/serial_ns16550.c @@ -314,12 +314,15 @@ static int ns16550_tstc(struct console_device *cdev) static void ns16550_probe_dt(struct device_d *dev, struct ns16550_priv *priv) { struct device_node *np = dev->device_node; + u32 offset; u32 width = 1; if (!IS_ENABLED(CONFIG_OFDEVICE)) return; of_property_read_u32(np, "clock-frequency", &priv->plat.clock); + if (of_property_read_u32(np, "reg-offset", &offset) == 0) + priv->mmiobase += offset; of_property_read_u32(np, "reg-shift", &priv->plat.shift); of_property_read_u32(np, "reg-io-width", &width); switch (width) { -- cgit v1.2.3 From 748adcd7ebfb1cced8611df5d494b20d650c0996 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 3 Jul 2019 12:40:31 +0200 Subject: startup: remove unused editcmd variable Nobody uses global.editcmd, so remove it. Signed-off-by: Sascha Hauer --- common/startup.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/common/startup.c b/common/startup.c index 5686c0fb32..749db18e5a 100644 --- a/common/startup.c +++ b/common/startup.c @@ -153,7 +153,6 @@ static const char * const global_autoboot_abort_keys[] = { }; static int global_autoboot_timeout = 3; static char *global_boot_default; -static char *global_editcmd; static char *global_linux_bootargs_base; static char *global_linux_bootargs_dyn_ip; static char *global_linux_bootargs_dyn_root; @@ -213,7 +212,6 @@ static int run_init(void) return 0; } - global_editcmd = xstrdup("sedit"); global_user = xstrdup("none"); globalvar_add_simple_string("user", &global_user); global_boot_default = xstrdup("net"); @@ -225,7 +223,6 @@ static int run_init(void) globalvar_add_simple_int("autoboot_timeout", &global_autoboot_timeout, "%u"); globalvar_add_simple_string("boot.default", &global_boot_default); - globalvar_add_simple_string("editcmd", &global_editcmd); globalvar_add_simple_string("linux.bootargs.base", &global_linux_bootargs_base); globalvar_add_simple_string("linux.bootargs.dyn.ip", -- cgit v1.2.3 From a1ee6140bcfd15d5ab2fef05898a3c361ab1b9e4 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 3 Jul 2019 12:56:14 +0200 Subject: startup: Create global.linux.bootargs.dyn.* variables where they are needed global.linux.bootargs.dyn.* variables are exclusively used in boot scripts, so create them right before executing a script. This moves the corresponding code from the unrelated startup code to the place where the variables are used. Signed-off-by: Sascha Hauer --- common/boot.c | 2 ++ common/startup.c | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/common/boot.c b/common/boot.c index 974eaf5d02..84b2ff9677 100644 --- a/common/boot.c +++ b/common/boot.c @@ -92,6 +92,8 @@ static int bootscript_boot(struct bootentry *entry, int verbose, int dryrun) return 0; } + globalvar_add_simple("linux.bootargs.dyn.ip", NULL); + globalvar_add_simple("linux.bootargs.dyn.root", NULL); globalvar_set_match("linux.bootargs.dyn.", ""); ret = run_command(bs->scriptpath); diff --git a/common/startup.c b/common/startup.c index 749db18e5a..7e5a167af1 100644 --- a/common/startup.c +++ b/common/startup.c @@ -154,8 +154,6 @@ static const char * const global_autoboot_abort_keys[] = { static int global_autoboot_timeout = 3; static char *global_boot_default; static char *global_linux_bootargs_base; -static char *global_linux_bootargs_dyn_ip; -static char *global_linux_bootargs_dyn_root; static char *global_user; static bool test_abort(void) @@ -225,10 +223,6 @@ static int run_init(void) globalvar_add_simple_string("boot.default", &global_boot_default); globalvar_add_simple_string("linux.bootargs.base", &global_linux_bootargs_base); - globalvar_add_simple_string("linux.bootargs.dyn.ip", - &global_linux_bootargs_dyn_ip); - globalvar_add_simple_string("linux.bootargs.dyn.root", - &global_linux_bootargs_dyn_root); /* Unblank console cursor */ printf("\e[?25h"); -- cgit v1.2.3 From 815189dd4c8be39b9caae6c06a75a994f1956140 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 3 Jul 2019 13:41:59 +0200 Subject: startup: Create boot related variables where they are used global.boot.default, global.linux.bootargs.base and global.user are used in the boot code, so create them there. Signed-off-by: Sascha Hauer --- common/boot.c | 18 ++++++++++++++---- common/startup.c | 10 ---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/common/boot.c b/common/boot.c index 84b2ff9677..14d4fe9d64 100644 --- a/common/boot.c +++ b/common/boot.c @@ -119,12 +119,22 @@ void boot_set_watchdog_timeout(unsigned int timeout) boot_watchdog_timeout = timeout; } -static int init_boot_watchdog_timeout(void) +static char *global_boot_default; +static char *global_user; + +static int init_boot(void) { - return globalvar_add_simple_int("boot.watchdog_timeout", - &boot_watchdog_timeout, "%u"); + global_boot_default = xstrdup("net"); + globalvar_add_simple_string("boot.default", &global_boot_default); + globalvar_add_simple_int("boot.watchdog_timeout", + &boot_watchdog_timeout, "%u"); + globalvar_add_simple("linux.bootargs.base", NULL); + global_user = xstrdup("none"); + globalvar_add_simple_string("user", &global_user); + + return 0; } -late_initcall(init_boot_watchdog_timeout); +late_initcall(init_boot); BAREBOX_MAGICVAR_NAMED(global_watchdog_timeout, global.boot.watchdog_timeout, "Watchdog enable timeout in seconds before booting"); diff --git a/common/startup.c b/common/startup.c index 7e5a167af1..b88c4a00d3 100644 --- a/common/startup.c +++ b/common/startup.c @@ -152,9 +152,6 @@ static const char * const global_autoboot_abort_keys[] = { "ctrl-c", }; static int global_autoboot_timeout = 3; -static char *global_boot_default; -static char *global_linux_bootargs_base; -static char *global_user; static bool test_abort(void) { @@ -210,19 +207,12 @@ static int run_init(void) return 0; } - global_user = xstrdup("none"); - globalvar_add_simple_string("user", &global_user); - global_boot_default = xstrdup("net"); - globalvar_add_simple_enum("autoboot_abort_key", &global_autoboot_abort_key, global_autoboot_abort_keys, ARRAY_SIZE(global_autoboot_abort_keys)); globalvar_add_simple_int("autoboot_timeout", &global_autoboot_timeout, "%u"); - globalvar_add_simple_string("boot.default", &global_boot_default); - globalvar_add_simple_string("linux.bootargs.base", - &global_linux_bootargs_base); /* Unblank console cursor */ printf("\e[?25h"); -- cgit v1.2.3 From 35266d7e583f1bcc519f710f9f455127a14f31e8 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 3 Jul 2019 13:48:25 +0200 Subject: startup: Factor out the autoboot counter to separate function The autoboot countdown is part of the init function. This patch factors out this code to a separate function to allow boards to call it at a different time. Also boards can set the autoboot state manually in case they have its own idea how to interrupt the autoboot process. Signed-off-by: Sascha Hauer --- common/startup.c | 134 ++++++++++++++++++++++++++++++++++++------------------- include/common.h | 10 +++++ 2 files changed, 98 insertions(+), 46 deletions(-) diff --git a/common/startup.c b/common/startup.c index b88c4a00d3..92bf94f849 100644 --- a/common/startup.c +++ b/common/startup.c @@ -182,20 +182,95 @@ static bool test_abort(void) } #define INITFILE "/env/bin/init" +#define MENUFILE "/env/menu/mainmenu" + +static enum autoboot_state autoboot_state = AUTOBOOT_UNKNOWN; + +/** + * set_autoboot_state - set the autoboot state + * @autoboot: the state to set + * + * This functions sets the autoboot state to the given state. This can be called + * by boards which have its own idea when and how the autoboot shall be aborted. + */ +void set_autoboot_state(enum autoboot_state autoboot) +{ + autoboot_state = autoboot; +} + +/** + * do_autoboot_countdown - print autoboot countdown to console + * + * This prints the autoboot countdown to the console and waits for input. This + * evaluates the global.autoboot_about_key to determine which keys are allowed + * to interrupt booting and also global.autoboot_timeout to determine the timeout + * for the counter. This function can be called multiple times, it is executed + * only the first time. + * + * Returns an enum autoboot_state value containing the user input. + */ +enum autoboot_state do_autoboot_countdown(void) +{ + unsigned flags = CONSOLE_COUNTDOWN_EXTERN; + int ret; + struct stat s; + bool menu_exists; + char *abortkeys = NULL; + unsigned char outkey; + + if (autoboot_state != AUTOBOOT_UNKNOWN) + return autoboot_state; + + globalvar_add_simple_enum("autoboot_abort_key", + &global_autoboot_abort_key, + global_autoboot_abort_keys, + ARRAY_SIZE(global_autoboot_abort_keys)); + globalvar_add_simple_int("autoboot_timeout", + &global_autoboot_timeout, "%u"); + + menu_exists = stat(MENUFILE, &s) == 0; + + if (menu_exists) { + printf("\nHit m for menu or %s to stop autoboot: ", + global_autoboot_abort_keys[global_autoboot_abort_key]); + abortkeys = "m"; + } else { + printf("\nHit %s to stop autoboot: ", + global_autoboot_abort_keys[global_autoboot_abort_key]); + } + + switch (global_autoboot_abort_key) { + case 0: + flags |= CONSOLE_COUNTDOWN_ANYKEY; + break; + case 1: + flags |= CONSOLE_COUNTDOWN_CTRLC; + break; + default: + break; + } + + ret = console_countdown(global_autoboot_timeout, flags, abortkeys, + &outkey); + + if (ret == 0) + autoboot_state = AUTOBOOT_BOOT; + else if (menu_exists && outkey == 'm') + autoboot_state = AUTOBOOT_MENU; + else + autoboot_state = AUTOBOOT_ABORT; + + return autoboot_state; +} static int run_init(void) { DIR *dir; struct dirent *d; const char *initdir = "/env/init"; - const char *menufile = "/env/menu/mainmenu"; - struct stat s; - unsigned flags = CONSOLE_COUNTDOWN_EXTERN; - unsigned char outkey; - int ret; - bool menu_exists; bool env_bin_init_exists; - char *abortkeys = NULL; + enum autoboot_state autoboot; + struct stat s; setenv("PATH", "/env/bin"); @@ -207,13 +282,6 @@ static int run_init(void) return 0; } - globalvar_add_simple_enum("autoboot_abort_key", - &global_autoboot_abort_key, - global_autoboot_abort_keys, - ARRAY_SIZE(global_autoboot_abort_keys)); - globalvar_add_simple_int("autoboot_timeout", - &global_autoboot_timeout, "%u"); - /* Unblank console cursor */ printf("\e[?25h"); @@ -240,44 +308,18 @@ static int run_init(void) closedir(dir); } - menu_exists = stat(menufile, &s) == 0; - - if (menu_exists) { - printf("\nHit m for menu or %s to stop autoboot: ", - global_autoboot_abort_keys[global_autoboot_abort_key]); - abortkeys = "m"; - } else { - printf("\nHit %s to stop autoboot: ", - global_autoboot_abort_keys[global_autoboot_abort_key]); - } - - switch (global_autoboot_abort_key) { - case 0: - flags |= CONSOLE_COUNTDOWN_ANYKEY; - break; - case 1: - flags |= CONSOLE_COUNTDOWN_CTRLC; - break; - default: - break; - } - - ret = console_countdown(global_autoboot_timeout, flags, abortkeys, - &outkey); + autoboot = do_autoboot_countdown(); - if (ret == 0) + if (autoboot == AUTOBOOT_BOOT) run_command("boot"); console_ctrlc_allow(); - if (menu_exists) { - if (outkey == 'm') - run_command(menufile); + if (autoboot == AUTOBOOT_MENU) + run_command(MENUFILE); - printf("Enter 'exit' to get back to the menu\n"); - run_shell(); - run_command(menufile); - } + run_shell(); + run_command(MENUFILE); return 0; } diff --git a/include/common.h b/include/common.h index b1294978d7..08f79a54af 100644 --- a/include/common.h +++ b/include/common.h @@ -93,6 +93,16 @@ unsigned long long strtoull_suffix(const char *str, char **endp, int base); */ extern int (*barebox_main)(void); +enum autoboot_state { + AUTOBOOT_UNKNOWN, + AUTOBOOT_ABORT, + AUTOBOOT_MENU, + AUTOBOOT_BOOT, +}; + +void set_autoboot_state(enum autoboot_state autoboot); +enum autoboot_state do_autoboot_countdown(void); + void __noreturn start_barebox(void); void shutdown_barebox(void); -- cgit v1.2.3 From 5249e7e7e8f1eba16fa496c38c4e8927de74818f Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Tue, 2 Jul 2019 09:17:54 +0200 Subject: blspec: invalidate only necessary bootm variables Instead of removing all global bootm variables, remove only the ones which will be set by the blspec entries. This allows setting the bootm.tee variable to load OP-TEE for blspec entries or setting the image load address. Signed-off-by: Rouven Czerwinski Signed-off-by: Sascha Hauer --- common/blspec.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/blspec.c b/common/blspec.c index 41f2a4c534..66e5033e35 100644 --- a/common/blspec.c +++ b/common/blspec.c @@ -63,7 +63,11 @@ static int blspec_boot(struct bootentry *be, int verbose, int dryrun) }; globalvar_set_match("linux.bootargs.dyn.", ""); - globalvar_set_match("bootm.", ""); + globalvar_set_match("bootm.image", ""); + globalvar_set_match("bootm.oftree", ""); + globalvar_set_match("bootm.initrd", ""); + + bootm_data_init_defaults(&data); devicetree = blspec_entry_var_get(entry, "devicetree"); initrd = blspec_entry_var_get(entry, "initrd"); -- cgit v1.2.3 From d1831a0208c70381cd110eb4d62afcd0c5a6bbd5 Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Tue, 2 Jul 2019 09:17:56 +0200 Subject: f_fastboot: remove only image from bootm variables Remove only the bootm.image variable which will be set by fastboot. Signed-off-by: Rouven Czerwinski Signed-off-by: Sascha Hauer --- drivers/usb/gadget/f_fastboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index bdf0c807df..82a202cc21 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -767,7 +767,7 @@ static void __maybe_unused cb_boot(struct f_fastboot *f_fb, const char *opt) fastboot_tx_print(f_fb, FASTBOOT_MSG_INFO, "Booting kernel..\n"); globalvar_set_match("linux.bootargs.dyn.", ""); - globalvar_set_match("bootm.", ""); + globalvar_set_match("bootm.image", ""); data.os_file = xstrdup(FASTBOOT_TMPFILE); -- cgit v1.2.3 From ba927c778091295310fdb105e10c257a0cfc61a3 Mon Sep 17 00:00:00 2001 From: Stefan Riedmueller Date: Wed, 10 Jul 2019 13:26:53 +0200 Subject: ARM: dts: am335x-phytec-state: Add backend-storage-type Add the backend-storage-type for both states and set it to "direct" as the backend is an EEPROM. Signed-off-by: Stefan Riedmueller Signed-off-by: Sascha Hauer --- arch/arm/dts/am335x-phytec-state.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/dts/am335x-phytec-state.dtsi b/arch/arm/dts/am335x-phytec-state.dtsi index 1f61cf5a2e..af4da4ea64 100644 --- a/arch/arm/dts/am335x-phytec-state.dtsi +++ b/arch/arm/dts/am335x-phytec-state.dtsi @@ -23,6 +23,7 @@ compatible = "barebox,state"; backend-type = "raw"; backend = <&backend_state_mac_eeprom>; + backend-storage-type = "direct"; backend-stridesize = <40>; keep-previous-content; @@ -44,6 +45,7 @@ compatible = "barebox,state"; backend-type = "raw"; backend = <&backend_state_update_eeprom>; + backend-storage-type = "direct"; backend-stridesize = <54>; keep-previous-content; -- cgit v1.2.3