diff options
500 files changed, 2582 insertions, 3539 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 421c501..7985ff5 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -138,25 +138,6 @@ stages: # seems to hang forever with pre-configured "container" environment docker run -v $PWD:$(work_dir) $(ci_runner_image) /bin/bash $(work_dir)/build.sh - - job: nokia_rx51_test - displayName: 'Run tests for Nokia RX-51 (aka N900)' - pool: - vmImage: $(ubuntu_vm) - container: - image: $(ci_runner_image) - options: $(container_option) - steps: - - script: | - mkdir nokia_rx51_tmp - ln -s /opt/nokia/u-boot-gen-combined nokia_rx51_tmp/ - ln -s /opt/nokia/qemu-n900.tar.gz nokia_rx51_tmp/ - ln -s /opt/nokia/kernel_2.6.28-20103103+0m5_armel.deb nokia_rx51_tmp/ - ln -s /opt/nokia/libc6_2.5.1-1eglibc27+0m5_armel.deb nokia_rx51_tmp/ - ln -s /opt/nokia/busybox_1.10.2.legal-1osso30+0m5_armel.deb nokia_rx51_tmp/ - ln -s /opt/nokia/qemu-system-arm nokia_rx51_tmp/ - export PATH=/opt/gcc-13.2.0-nolibc/arm-linux-gnueabi/bin:$PATH - test/nokia_rx51_test.sh - - job: pylint displayName: Check for any pylint regressions pool: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 981b95c..129234b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -211,19 +211,6 @@ Run binman, buildman, dtoc, Kconfig and patman testsuites: ./tools/patman/patman test; make testconfig -Run tests for Nokia RX-51 (aka N900): - extends: .testsuites - script: - - mkdir nokia_rx51_tmp; - ln -s /opt/nokia/u-boot-gen-combined nokia_rx51_tmp/; - ln -s /opt/nokia/qemu-n900.tar.gz nokia_rx51_tmp/; - ln -s /opt/nokia/kernel_2.6.28-20103103+0m5_armel.deb nokia_rx51_tmp/; - ln -s /opt/nokia/libc6_2.5.1-1eglibc27+0m5_armel.deb nokia_rx51_tmp/; - ln -s /opt/nokia/busybox_1.10.2.legal-1osso30+0m5_armel.deb nokia_rx51_tmp/; - ln -s /opt/nokia/qemu-system-arm nokia_rx51_tmp/; - export PATH=/opt/gcc-13.2.0-nolibc/arm-linux-gnueabi/bin:$PATH; - test/nokia_rx51_test.sh - # Check for any pylint regressions Run pylint: extends: .testsuites @@ -372,6 +372,17 @@ if EXPERT When disabling this, please check if malloc calls, maybe should be replaced by calloc - if one expects zeroed memory. +config SPL_SYS_MALLOC_CLEAR_ON_INIT + bool "Init with zeros the memory reserved for malloc (slow) in SPL" + depends on SPL + default SYS_MALLOC_CLEAR_ON_INIT + help + Same as SYS_MALLOC_CLEAR_ON_INIT, but for SPL. It's possible to + Enable it without SYS_MALLOC_CLEAR_ON_INIT. It's useful for boards + that must have particular memory regions zero'ed before first use. + If SYS_SPL_MALLOC_START is configured to be in such region, this + option should be enabled. + config SYS_MALLOC_DEFAULT_TO_INIT bool "Default malloc to init while reserving the memory for it" help diff --git a/MAINTAINERS b/MAINTAINERS index 536df4a..4df7925 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -366,7 +366,6 @@ F: drivers/watchdog/orion_wdt.c F: include/configs/mv-common.h ARM MARVELL PCIE CONTROLLER DRIVERS -M: Pali Rohár <pali@kernel.org> M: Stefan Roese <sr@denx.de> S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-marvell.git @@ -725,7 +724,10 @@ F: drivers/usb/musb-new/ux500.c F: drivers/video/mcde_simple.c ARM UNIPHIER -S: Orphan (Since 2020-09) +M: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> +R: Dai Okamura <okamura.dai@socionext.com> +S: Maintained +F: arch/arm/dts/uniphier-* F: arch/arm/mach-uniphier/ F: configs/uniphier_*_defconfig N: uniphier @@ -1597,7 +1599,7 @@ T: git https://source.denx.de/u-boot/custodians/u-boot-ubi.git F: drivers/mtd/ubi/ UFS -M: Bhupesh Sharma <bhupesh.sharma@linaro.org> +M: Bhupesh Sharma <bhupesh.linux@gmail.com> M: Neha Malcom Francis <n-francis@ti.com> S: Maintained F: drivers/ufs/ @@ -3,7 +3,7 @@ VERSION = 2023 PATCHLEVEL = 10 SUBLEVEL = -EXTRAVERSION = -rc4 +EXTRAVERSION = NAME = # *DOCUMENTATION* diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 71f820e..7b09784 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -2112,7 +2112,7 @@ config SERIAL_TAG config STATIC_MACH_TYPE bool "Statically define the Machine ID number" - default y if TARGET_DS109 || TARGET_NOKIA_RX51 || TARGET_DS414 || DEFAULT_DEVICE_TREE = "sun7i-a20-icnova-swac" + default y if TARGET_DS109 || TARGET_DS414 || DEFAULT_DEVICE_TREE = "sun7i-a20-icnova-swac" help When booting via ATAGs, enable this option if we know the correct machine ID number to use at compile time. Some systems will be @@ -2122,7 +2122,6 @@ config MACH_TYPE int "Machine ID number" depends on STATIC_MACH_TYPE default 527 if TARGET_DS109 - default 1955 if TARGET_NOKIA_RX51 default 3036 if TARGET_DS414 default 4283 if DEFAULT_DEVICE_TREE = "sun7i-a20-icnova-swac" help diff --git a/arch/arm/dts/imx7d-colibri-eval-v3-u-boot.dtsi b/arch/arm/dts/imx7d-colibri-eval-v3-u-boot.dtsi index 52aa875..57ca28e 100644 --- a/arch/arm/dts/imx7d-colibri-eval-v3-u-boot.dtsi +++ b/arch/arm/dts/imx7d-colibri-eval-v3-u-boot.dtsi @@ -3,6 +3,8 @@ * Copyright 2020-2022 Toradex */ +#include "imx7s-u-boot.dtsi" + &{/aliases} { /* SDHCI instance order: eMMC, SD/MMC */ mmc0 = &usdhc3; diff --git a/arch/arm/dts/imx7d-pico-pi-u-boot.dtsi b/arch/arm/dts/imx7d-pico-pi-u-boot.dtsi index 67b41ae..843b458 100644 --- a/arch/arm/dts/imx7d-pico-pi-u-boot.dtsi +++ b/arch/arm/dts/imx7d-pico-pi-u-boot.dtsi @@ -1,3 +1,5 @@ +#include "imx7s-u-boot.dtsi" + /{ aliases { mmc0 = &usdhc3; diff --git a/arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi b/arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi index 62cdcba..896c8bc 100644 --- a/arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi +++ b/arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi @@ -3,6 +3,8 @@ * Copyright 2018 NXP */ +#include "imx7s-u-boot.dtsi" + &qspi { flash0: mx25l51245g@0 { compatible = "jedec,spi-nor"; diff --git a/arch/arm/dts/imx7d-sdb-u-boot.dtsi b/arch/arm/dts/imx7d-sdb-u-boot.dtsi index ac1d6e2..e4a27b8 100644 --- a/arch/arm/dts/imx7d-sdb-u-boot.dtsi +++ b/arch/arm/dts/imx7d-sdb-u-boot.dtsi @@ -1,3 +1,5 @@ +#include "imx7s-u-boot.dtsi" + &fec2 { status = "disable"; }; diff --git a/arch/arm/dts/imx7d-smegw01-u-boot.dtsi b/arch/arm/dts/imx7d-smegw01-u-boot.dtsi new file mode 100644 index 0000000..90f7500 --- /dev/null +++ b/arch/arm/dts/imx7d-smegw01-u-boot.dtsi @@ -0,0 +1,3 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +#include "imx7s-u-boot.dtsi" diff --git a/arch/arm/dts/imx7s-u-boot.dtsi b/arch/arm/dts/imx7s-u-boot.dtsi new file mode 100644 index 0000000..c4c1da3 --- /dev/null +++ b/arch/arm/dts/imx7s-u-boot.dtsi @@ -0,0 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT + +&crypto { + sec_jr0: jr@1000 { + status = "disabled"; + }; +}; diff --git a/arch/arm/dts/salvator-common.dtsi b/arch/arm/dts/salvator-common.dtsi index 98bbcaf..23fdd11 100644 --- a/arch/arm/dts/salvator-common.dtsi +++ b/arch/arm/dts/salvator-common.dtsi @@ -328,6 +328,8 @@ status = "okay"; phy0: ethernet-phy@0 { + compatible = "ethernet-phy-id0022.1622", + "ethernet-phy-ieee802.3-c22"; rxc-skew-ps = <1500>; reg = <0>; interrupt-parent = <&gpio2>; diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 2136ab7..266bb20 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -32,6 +32,7 @@ config IMX_RDC config IMX_BOOTAUX bool "Support boot auxiliary core" depends on ARCH_MX7 || ARCH_MX6 || ARCH_VF610 || ARCH_IMX8 || ARCH_IMX8M + select LIB_ELF help bootaux [addr] to boot auxiliary core. diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c index b3ef36c..27e053e 100644 --- a/arch/arm/mach-imx/hab.c +++ b/arch/arm/mach-imx/hab.c @@ -662,7 +662,7 @@ static int do_authenticate_image_or_failover(struct cmd_tbl *cmdtp, int flag, { int ret = CMD_RET_FAILURE; - if (argc != 4) { + if (argc < 3) { ret = CMD_RET_USAGE; goto error; } @@ -703,7 +703,7 @@ U_BOOT_CMD( "addr length ivt_offset\n" "addr - image hex address\n" "length - image hex length\n" - "ivt_offset - hex offset of IVT in the image" + "ivt_offset - hex offset of IVT in the image (optional)" ); U_BOOT_CMD( @@ -715,11 +715,11 @@ U_BOOT_CMD( U_BOOT_CMD( hab_auth_img_or_fail, 4, 0, do_authenticate_image_or_failover, - "authenticate image via HAB on failure drop to USB BootROM mode", + "authenticate image via HAB. Switch to USB BootROM mode on failure", "addr length ivt_offset\n" "addr - image hex address\n" "length - image hex length\n" - "ivt_offset - hex offset of IVT in the image" + "ivt_offset - hex offset of IVT in the image (optional)" ); U_BOOT_CMD( diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index 431ad95..fc82958 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -244,7 +244,7 @@ int dram_init(void) return ret; /* rom_pointer[1] contains the size of TEE occupies */ - if (!IS_ENABLED(CONFIG_ARMV8_PSCI) && rom_pointer[1]) + if (!IS_ENABLED(CONFIG_ARMV8_PSCI) && !IS_ENABLED(CONFIG_SPL_BUILD) && rom_pointer[1]) gd->ram_size = sdram_size - rom_pointer[1]; else gd->ram_size = sdram_size; @@ -273,7 +273,7 @@ int dram_init_banksize(void) } gd->bd->bi_dram[bank].start = PHYS_SDRAM; - if (!IS_ENABLED(CONFIG_ARMV8_PSCI) && rom_pointer[1]) { + if (!IS_ENABLED(CONFIG_ARMV8_PSCI) && !IS_ENABLED(CONFIG_SPL_BUILD) && rom_pointer[1]) { phys_addr_t optee_start = (phys_addr_t)rom_pointer[0]; phys_size_t optee_size = (size_t)rom_pointer[1]; @@ -318,7 +318,8 @@ phys_size_t get_effective_memsize(void) sdram_b1_size = sdram_size; } - if (!IS_ENABLED(CONFIG_ARMV8_PSCI) && rom_pointer[1]) { + if (!IS_ENABLED(CONFIG_ARMV8_PSCI) && !IS_ENABLED(CONFIG_SPL_BUILD) && + rom_pointer[1]) { /* We will relocate u-boot to Top of dram1. Tee position has two cases: * 1. At the top of dram1, Then return the size removed optee size. * 2. In the middle of dram1, return the size of dram1. diff --git a/arch/arm/mach-imx/imx9/soc.c b/arch/arm/mach-imx/imx9/soc.c index 5d8687b..86b45be 100644 --- a/arch/arm/mach-imx/imx9/soc.c +++ b/arch/arm/mach-imx/imx9/soc.c @@ -361,7 +361,7 @@ int dram_init(void) return ret; /* rom_pointer[1] contains the size of TEE occupies */ - if (rom_pointer[1]) + if (!IS_ENABLED(CONFIG_SPL_BUILD) && rom_pointer[1]) gd->ram_size = sdram_size - rom_pointer[1]; else gd->ram_size = sdram_size; @@ -390,7 +390,7 @@ int dram_init_banksize(void) } gd->bd->bi_dram[bank].start = PHYS_SDRAM; - if (rom_pointer[1]) { + if (!IS_ENABLED(CONFIG_SPL_BUILD) && rom_pointer[1]) { phys_addr_t optee_start = (phys_addr_t)rom_pointer[0]; phys_size_t optee_size = (size_t)rom_pointer[1]; @@ -435,7 +435,7 @@ phys_size_t get_effective_memsize(void) else sdram_b1_size = sdram_size; - if (rom_pointer[1]) { + if (!IS_ENABLED(CONFIG_SPL_BUILD) && rom_pointer[1]) { /* We will relocate u-boot to top of dram1. TEE position has two cases: * 1. At the top of dram1, Then return the size removed optee size. * 2. In the middle of dram1, return the size of dram1. diff --git a/arch/arm/mach-omap2/omap3/Kconfig b/arch/arm/mach-omap2/omap3/Kconfig index 671e479..3e3e7bd 100644 --- a/arch/arm/mach-omap2/omap3/Kconfig +++ b/arch/arm/mach-omap2/omap3/Kconfig @@ -105,15 +105,6 @@ config TARGET_OMAP3_LOGIC select OMAP3_GPIO_6 imply CMD_DM -config TARGET_NOKIA_RX51 - bool "Nokia RX51" - select POSITION_INDEPENDENT - select SKIP_LOWLEVEL_INIT - select SUPPORT_PASSING_ATAGS - select CMDLINE_TAG - select INITRD_TAG - select REVISION_TAG - config TARGET_TAO3530 bool "TAO3530" select OMAP3_GPIO_2 @@ -166,7 +157,6 @@ source "board/timll/devkit8000/Kconfig" source "board/ti/omap3evm/Kconfig" source "board/isee/igep00x0/Kconfig" source "board/logicpd/omap3som/Kconfig" -source "board/nokia/rx51/Kconfig" source "board/lg/sniper/Kconfig" endif diff --git a/arch/riscv/cpu/jh7110/Kconfig b/arch/riscv/cpu/jh7110/Kconfig index 8469ee7..e5549a0 100644 --- a/arch/riscv/cpu/jh7110/Kconfig +++ b/arch/riscv/cpu/jh7110/Kconfig @@ -28,3 +28,4 @@ config STARFIVE_JH7110 imply SPL_LOAD_FIT imply SPL_OPENSBI imply SPL_RISCV_ACLINT + imply SPL_SYS_MALLOC_CLEAR_ON_INIT diff --git a/arch/riscv/dts/jh7110.dtsi b/arch/riscv/dts/jh7110.dtsi index 081b833..ec237a4 100644 --- a/arch/riscv/dts/jh7110.dtsi +++ b/arch/riscv/dts/jh7110.dtsi @@ -163,6 +163,15 @@ }; }; + timer { + compatible = "riscv,timer"; + interrupts-extended = <&cpu0_intc 5>, + <&cpu1_intc 5>, + <&cpu2_intc 5>, + <&cpu3_intc 5>, + <&cpu4_intc 5>; + }; + osc: oscillator { compatible = "fixed-clock"; clock-output-names = "osc"; diff --git a/arch/riscv/include/asm/sbi.h b/arch/riscv/include/asm/sbi.h index 009a268..bf4c9af 100644 --- a/arch/riscv/include/asm/sbi.h +++ b/arch/riscv/include/asm/sbi.h @@ -170,5 +170,6 @@ int sbi_get_mvendorid(long *mvendorid); int sbi_get_marchid(long *marchid); int sbi_get_mimpid(long *mimpid); void sbi_srst_reset(unsigned long type, unsigned long reason); +int sbi_dbcn_write_byte(unsigned char ch); #endif diff --git a/arch/riscv/lib/sbi.c b/arch/riscv/lib/sbi.c index 8724e3a..55a3bc3 100644 --- a/arch/riscv/lib/sbi.c +++ b/arch/riscv/lib/sbi.c @@ -204,6 +204,22 @@ void sbi_srst_reset(unsigned long type, unsigned long reason) 0, 0, 0, 0); } +/** + * sbi_dbcn_write_byte() - write byte to debug console + * + * @ch: byte to be written + * Return: SBI error code (SBI_SUCCESS = 0 on success) + */ +int sbi_dbcn_write_byte(unsigned char ch) +{ + struct sbiret ret; + + ret = sbi_ecall(SBI_EXT_DBCN, + SBI_EXT_DBCN_CONSOLE_WRITE_BYTE, + ch, 0, 0, 0, 0, 0); + return ret.error; +} + #ifdef CONFIG_SBI_V01 /** diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index 9a863ea..962b9eb 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -120,7 +120,7 @@ /* * This is used for the VBE OS-request tests. A FAT filesystem * created in a partition with the VBE information appearing - * before the parititon starts + * before the partition starts */ firmware0 { bootph-verify; diff --git a/board/CZ.NIC/turris_mox/MAINTAINERS b/board/CZ.NIC/turris_mox/MAINTAINERS index b29ce92..5f0551e 100644 --- a/board/CZ.NIC/turris_mox/MAINTAINERS +++ b/board/CZ.NIC/turris_mox/MAINTAINERS @@ -1,6 +1,5 @@ TURRIS MOX BOARD M: Marek Behún <kabel@kernel.org> -M: Pali Rohár <pali@kernel.org> S: Maintained F: arch/arm/dts/armada-3720-turris-mox*.dts* F: board/CZ.NIC/turris_mox/ diff --git a/board/CZ.NIC/turris_omnia/MAINTAINERS b/board/CZ.NIC/turris_omnia/MAINTAINERS index 8bff97cc..effce8a 100644 --- a/board/CZ.NIC/turris_omnia/MAINTAINERS +++ b/board/CZ.NIC/turris_omnia/MAINTAINERS @@ -1,6 +1,5 @@ TURRIS OMNIA BOARD M: Marek Behún <kabel@kernel.org> -M: Pali Rohár <pali@kernel.org> S: Maintained F: arch/arm/dts/armada-385-turris-omnia*.dts* F: board/CZ.NIC/turris_atsha_otp.* diff --git a/board/nokia/rx51/Kconfig b/board/nokia/rx51/Kconfig deleted file mode 100644 index c884543..0000000 --- a/board/nokia/rx51/Kconfig +++ /dev/null @@ -1,48 +0,0 @@ -if TARGET_NOKIA_RX51 - -config USB_DEVICE - def_bool y - help - Legacy UDC device support - -config USB_TTY - def_bool y - help - Legacy tty type of device available to talk to the UDC device - -config USBD_VENDORID - hex - default 0x0421 - -config USBD_PRODUCTID_CDCACM - hex - default 0x01c8 - -config USBD_PRODUCTID_GSERIAL - hex - default 0x01c8 - -config USBD_MANUFACTURER - string - default "Nokia" - -config USBD_PRODUCT_NAME - string - default "N900 (U-Boot)" - -config NR_DRAM_BANKS - default 2 - -config SYS_BOARD - default "rx51" - -config SYS_VENDOR - default "nokia" - -config SYS_CONFIG_NAME - default "nokia_rx51" - -config SYS_PROMPT - default "Nokia RX-51 # " - -endif diff --git a/board/nokia/rx51/MAINTAINERS b/board/nokia/rx51/MAINTAINERS deleted file mode 100644 index 25f8b3c..0000000 --- a/board/nokia/rx51/MAINTAINERS +++ /dev/null @@ -1,8 +0,0 @@ -RX51 BOARD -M: Pali Rohár <pali@kernel.org> -S: Maintained -F: board/nokia/rx51/ -F: include/configs/nokia_rx51.h -F: configs/nokia_rx51_defconfig -F: doc/board/nokia/rx51.rst -F: test/nokia_rx51_test.sh diff --git a/board/nokia/rx51/Makefile b/board/nokia/rx51/Makefile deleted file mode 100644 index 842f9e6..0000000 --- a/board/nokia/rx51/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# (C) Copyright 2000, 2001, 2002 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. - -obj-y := rx51.o -obj-y += lowlevel_init.o diff --git a/board/nokia/rx51/lowlevel_init.S b/board/nokia/rx51/lowlevel_init.S deleted file mode 100644 index 44f32f1..0000000 --- a/board/nokia/rx51/lowlevel_init.S +++ /dev/null @@ -1,97 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * (C) Copyright 2011-2012 - * Pali Rohár <pali@kernel.org> - */ - -#include <config.h> -#include <linux/linkage.h> - -kernoffs: /* offset of kernel image from this address */ - .word . - CONFIG_TEXT_BASE - KERNEL_OFFSET - -kernaddr: /* address of kernel after copying */ - .word KERNEL_ADDRESS - -kernsize: /* maximal size of kernel image */ - .word KERNEL_MAXSIZE - -imagesize: /* maximal size of image */ - .word IMAGE_MAXSIZE - -ih_magic: /* IH_MAGIC in big endian from include/image.h */ - .word 0x56190527 - -z_magic: /* LINUX_ARM_ZIMAGE_MAGIC */ - .word 0x016f2818 - -/* - * Routine: save_boot_params (called after reset from start.S) - * Description: Copy attached kernel to address KERNEL_ADDRESS - */ - -ENTRY(save_boot_params) - -/* - * Copy valid attached kernel to absolute address KERNEL_ADDRESS - * - * Nokia X-Loader is loading secondary image to address 0x80400000. - * NOLO is loading boot image to random place, so it doesn't really - * matter what is set in CONFIG_TEXT_BASE. We have to detect - * KERNEL_OFFSET from the current execution address and copy it to - * absolute address KERNEL_ADDRESS. - * - * Note that U-Boot has to be compiled with CONFIG_POSITION_INDEPENDENT - * because it is loaded at random address and not to the fixed address - * (CONFIG_TEXT_BASE). - */ - - /* r0 - start of kernel before */ - adr r0, kernoffs /* r0 - current address of kernoffs section */ - ldr r1, kernoffs /* r1 - offset of kernel image from kernoffs section */ - sub r0, r0, r1 - - /* r3 - start of kernel after */ - ldr r3, kernaddr - - /* r2 - end of kernel after */ - ldr r1, kernsize - add r2, r3, r1 - - /* r1 - end of kernel before */ - add r1, r0, r1 - - /* remove header in target kernel */ - mov r5, #0 - str r5, [r3] /* remove 4 bytes header of kernel uImage */ - str r5, [r3, #36] /* remove 4 bytes header of kernel zImage */ - - /* check for valid kernel uImage */ - ldr r4, [r0] /* r4 - 4 bytes header of kernel */ - ldr r5, ih_magic /* r5 - IH_MAGIC */ - cmp r4, r5 - beq copy_kernel_loop - - /* check for valid kernel zImage */ - ldr r4, [r0, #36] /* r4 - 4 bytes header of kernel at offset 36 */ - ldr r5, z_magic /* r5 - LINUX_ARM_ZIMAGE_MAGIC */ - cmp r4, r5 - bne skip_copy /* skip if invalid image */ - -copy_kernel_loop: - ldmdb r1!, {r3 - r10} - stmdb r2!, {r3 - r10} - cmp r1, r0 - bhi copy_kernel_loop - - /* remove header in source kernel image */ - mov r5, #0 - str r5, [r0] /* remove 4 bytes header of kernel uImage */ - str r5, [r0, #36] /* remove 4 bytes header of kernel zImage */ - -skip_copy: - - /* Returns */ - b save_boot_params_ret - -ENDPROC(save_boot_params) diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c deleted file mode 100644 index 238b963..0000000 --- a/board/nokia/rx51/rx51.c +++ /dev/null @@ -1,806 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * (C) Copyright 2012 - * Ивайло Димитров <freemangordon@abv.bg> - * - * (C) Copyright 2011-2012 - * Pali Rohár <pali@kernel.org> - * - * (C) Copyright 2010 - * Alistair Buxton <a.j.buxton@gmail.com> - * - * Derived from Beagle Board and 3430 SDP code: - * (C) Copyright 2004-2008 - * Texas Instruments, <www.ti.com> - * - * Author : - * Sunil Kumar <sunilsaini05@gmail.com> - * Shashi Ranjan <shashiranjanmca05@gmail.com> - * - * Richard Woodruff <r-woodruff2@ti.com> - * Syed Mohammed Khasim <khasim@ti.com> - */ - -#include <common.h> -#include <dm.h> -#include <env.h> -#include <init.h> -#include <watchdog.h> -#include <wdt.h> -#include <malloc.h> -#include <twl4030.h> -#include <i2c.h> -#include <video.h> -#include <keyboard.h> -#include <ns16550.h> -#include <asm/global_data.h> -#include <asm/io.h> -#include <asm/setup.h> -#include <asm/bitops.h> -#include <asm/mach-types.h> -#include <asm/omap_i2c.h> -#include <asm/arch/mux.h> -#include <asm/arch/sys_proto.h> -#include <asm/arch/mmc_host_def.h> - -#include "tag_omap.h" - -/* Needed for ROM SMC call */ -struct emu_hal_params_rx51 { - u32 num_params; - u32 param1; - u32 param2; - u32 param3; - u32 param4; -}; - -#define ONENAND_GPMC_CONFIG1_RX51 0xfb001202 -#define ONENAND_GPMC_CONFIG2_RX51 0x00111100 -#define ONENAND_GPMC_CONFIG3_RX51 0x00020200 -#define ONENAND_GPMC_CONFIG4_RX51 0x11001102 -#define ONENAND_GPMC_CONFIG5_RX51 0x03101616 -#define ONENAND_GPMC_CONFIG6_RX51 0x90060000 - -DECLARE_GLOBAL_DATA_PTR; - -const omap3_sysinfo sysinfo = { - DDR_STACKED, - "Nokia RX-51", - "OneNAND" -}; - -/* This structure contains default omap tags needed for booting Maemo 5 */ -static struct tag_omap omap[] = { - OMAP_TAG_UART_CONFIG(0x04), - OMAP_TAG_SERIAL_CONSOLE_CONFIG(0x03, 0x01C200), - OMAP_TAG_LCD_CONFIG("acx565akm", "internal", 90, 0x18), - OMAP_TAG_GPIO_SWITCH_CONFIG("cam_focus", 0x44, 0x1, 0x2, 0x0), - OMAP_TAG_GPIO_SWITCH_CONFIG("cam_launch", 0x45, 0x1, 0x2, 0x0), - OMAP_TAG_GPIO_SWITCH_CONFIG("cam_shutter", 0x6e, 0x1, 0x0, 0x0), - OMAP_TAG_GPIO_SWITCH_CONFIG("cmt_apeslpx", 0x46, 0x2, 0x2, 0x0), - OMAP_TAG_GPIO_SWITCH_CONFIG("cmt_bsi", 0x9d, 0x2, 0x2, 0x0), - OMAP_TAG_GPIO_SWITCH_CONFIG("cmt_en", 0x4a, 0x2, 0x2, 0x0), - OMAP_TAG_GPIO_SWITCH_CONFIG("cmt_rst", 0x4b, 0x6, 0x2, 0x0), - OMAP_TAG_GPIO_SWITCH_CONFIG("cmt_rst_rq", 0x49, 0x6, 0x2, 0x0), - OMAP_TAG_GPIO_SWITCH_CONFIG("cmt_wddis", 0x0d, 0x2, 0x2, 0x0), - OMAP_TAG_GPIO_SWITCH_CONFIG("headphone", 0xb1, 0x1, 0x1, 0x0), - OMAP_TAG_GPIO_SWITCH_CONFIG("kb_lock", 0x71, 0x1, 0x0, 0x0), - OMAP_TAG_GPIO_SWITCH_CONFIG("proximity", 0x59, 0x0, 0x0, 0x0), - OMAP_TAG_GPIO_SWITCH_CONFIG("sleep_ind", 0xa2, 0x2, 0x2, 0x0), - OMAP_TAG_GPIO_SWITCH_CONFIG("slide", GPIO_SLIDE, 0x0, 0x0, 0x0), - OMAP_TAG_WLAN_CX3110X_CONFIG(0x25, 0xff, 87, 42, -1), - OMAP_TAG_PARTITION_CONFIG("bootloader", 128 * 1024, 0x00000000, 0x00000003), - OMAP_TAG_PARTITION_CONFIG("config", 384 * 1024, 0x00020000, 0x00000000), - OMAP_TAG_PARTITION_CONFIG("log", 256 * 1024, 0x00080000, 0x00000000), - OMAP_TAG_PARTITION_CONFIG("kernel", 2 * 1024*1024, 0x000c0000, 0x00000000), - OMAP_TAG_PARTITION_CONFIG("initfs", 2 * 1024*1024, 0x002c0000, 0x00000000), - OMAP_TAG_PARTITION_CONFIG("rootfs", 257280 * 1024, 0x004c0000, 0x00000000), - OMAP_TAG_BOOT_REASON_CONFIG("pwr_key"), - OMAP_TAG_VERSION_STR_CONFIG("product", "RX-51"), - OMAP_TAG_VERSION_STR_CONFIG("hw-build", "2101"), - OMAP_TAG_VERSION_STR_CONFIG("nolo", "1.4.14"), - OMAP_TAG_VERSION_STR_CONFIG("boot-mode", "normal"), - { } -}; - -static char *boot_reason_ptr; -static char *hw_build_ptr; -static char *nolo_version_ptr; -static char *boot_mode_ptr; -static int serial_was_console_enabled; - -/* - * Routine: init_omap_tags - * Description: Initialize pointers to values in tag_omap - */ -static void init_omap_tags(void) -{ - char *component; - char *version; - int i = 0; - while (omap[i].hdr.tag) { - switch (omap[i].hdr.tag) { - case OMAP_TAG_BOOT_REASON: - boot_reason_ptr = omap[i].u.boot_reason.reason_str; - break; - case OMAP_TAG_VERSION_STR: - component = omap[i].u.version.component; - version = omap[i].u.version.version; - if (strcmp(component, "hw-build") == 0) - hw_build_ptr = version; - else if (strcmp(component, "nolo") == 0) - nolo_version_ptr = version; - else if (strcmp(component, "boot-mode") == 0) - boot_mode_ptr = version; - break; - default: - break; - } - i++; - } -} - -static void reuse_omap_atags(struct tag_omap *t) -{ - char *component; - char *version; - while (t->hdr.tag) { - switch (t->hdr.tag) { - case OMAP_TAG_BOOT_REASON: - memset(boot_reason_ptr, 0, 12); - strcpy(boot_reason_ptr, t->u.boot_reason.reason_str); - break; - case OMAP_TAG_VERSION_STR: - component = t->u.version.component; - version = t->u.version.version; - if (strcmp(component, "hw-build") == 0) { - memset(hw_build_ptr, 0, 12); - strcpy(hw_build_ptr, version); - } else if (strcmp(component, "nolo") == 0) { - memset(nolo_version_ptr, 0, 12); - strcpy(nolo_version_ptr, version); - } else if (strcmp(component, "boot-mode") == 0) { - memset(boot_mode_ptr, 0, 12); - strcpy(boot_mode_ptr, version); - } - break; - case OMAP_TAG_UART: - if (t->u.uart.enabled_uarts) - serial_was_console_enabled = 1; - break; - case OMAP_TAG_SERIAL_CONSOLE: - serial_was_console_enabled = 1; - break; - default: - break; - } - t = tag_omap_next(t); - } -} - -/* - * Routine: reuse_atags - * Description: Reuse atags from previous bootloader. - * Reuse only only HW build, boot reason, boot mode and nolo - */ -static void reuse_atags(void) -{ - struct tag *t = (struct tag *)gd->bd->bi_boot_params; - - /* First tag must be ATAG_CORE */ - if (t->hdr.tag != ATAG_CORE) - return; - - if (!boot_reason_ptr || !hw_build_ptr) - return; - - /* Last tag must be ATAG_NONE */ - while (t->hdr.tag != ATAG_NONE) { - switch (t->hdr.tag) { - case ATAG_REVISION: - memset(hw_build_ptr, 0, 12); - sprintf(hw_build_ptr, "%x", t->u.revision.rev); - break; - case ATAG_BOARD: - reuse_omap_atags((struct tag_omap *)&t->u); - break; - default: - break; - } - t = tag_next(t); - } -} - -/* - * Routine: board_init - * Description: Early hardware init. - */ -int board_init(void) -{ -#if defined(CONFIG_CMD_ONENAND) - const u32 gpmc_regs_onenandrx51[GPMC_MAX_REG] = { - ONENAND_GPMC_CONFIG1_RX51, - ONENAND_GPMC_CONFIG2_RX51, - ONENAND_GPMC_CONFIG3_RX51, - ONENAND_GPMC_CONFIG4_RX51, - ONENAND_GPMC_CONFIG5_RX51, - ONENAND_GPMC_CONFIG6_RX51, - 0 - }; -#endif - /* in SRAM or SDRAM, finish GPMC */ - gpmc_init(); -#if defined(CONFIG_CMD_ONENAND) - enable_gpmc_cs_config(gpmc_regs_onenandrx51, &gpmc_cfg->cs[0], - CFG_SYS_ONENAND_BASE, GPMC_SIZE_256M); -#endif - /* Enable the clks & power */ - per_clocks_enable(); - /* boot param addr */ - gd->bd->bi_boot_params = OMAP34XX_SDRC_CS0 + 0x100; - return 0; -} - -#ifdef CONFIG_REVISION_TAG -/* - * Routine: get_board_revision - * Description: Return board revision. - */ -u32 get_board_rev(void) -{ - return simple_strtol(hw_build_ptr, NULL, 16); -} -#endif - -/* - * Routine: setup_board_tags - * Description: Append board specific boot tags. - */ -void setup_board_tags(struct tag **in_params) -{ - int setup_console_atag; - char *setup_boot_reason_atag; - char *setup_boot_mode_atag; - char *str; - int i; - int size; - int total_size; - struct tag *params; - struct tag_omap *t; - - params = (struct tag *)gd->bd->bi_boot_params; - - params->u.core.flags = 0x0; - params->u.core.pagesize = 0x1000; - params->u.core.rootdev = 0x0; - - /* append omap atag only if env setup_omap_atag is set to 1 */ - str = env_get("setup_omap_atag"); - if (!str || str[0] != '1') - return; - - str = env_get("setup_console_atag"); - if (str && str[0]) { - if (str[0] == '1') - setup_console_atag = 1; - else - setup_console_atag = 0; - } else { - if (serial_was_console_enabled) - setup_console_atag = 1; - else - setup_console_atag = 0; - } - - setup_boot_reason_atag = env_get("setup_boot_reason_atag"); - setup_boot_mode_atag = env_get("setup_boot_mode_atag"); - - params = *in_params; - t = (struct tag_omap *)¶ms->u; - total_size = sizeof(struct tag_header); - - for (i = 0; omap[i].hdr.tag; i++) { - - /* skip serial console tag */ - if (!setup_console_atag && - omap[i].hdr.tag == OMAP_TAG_SERIAL_CONSOLE) - continue; - - size = omap[i].hdr.size + sizeof(struct tag_omap_header); - memcpy(t, &omap[i], size); - - /* set uart tag to 0 - disable serial console */ - if (!setup_console_atag && omap[i].hdr.tag == OMAP_TAG_UART) - t->u.uart.enabled_uarts = 0; - - /* change boot reason */ - if (setup_boot_reason_atag && - omap[i].hdr.tag == OMAP_TAG_BOOT_REASON) { - memset(t->u.boot_reason.reason_str, 0, 12); - strcpy(t->u.boot_reason.reason_str, - setup_boot_reason_atag); - } - - /* change boot mode */ - if (setup_boot_mode_atag && - omap[i].hdr.tag == OMAP_TAG_VERSION_STR && - strcmp(omap[i].u.version.component, "boot-mode") == 0) { - memset(t->u.version.version, 0, 12); - strcpy(t->u.version.version, setup_boot_mode_atag); - } - - total_size += size; - t = tag_omap_next(t); - - } - - params->hdr.tag = ATAG_BOARD; - params->hdr.size = total_size >> 2; - params = tag_next(params); - - *in_params = params; -} - -static int rx51_video_probe(struct udevice *dev) -{ - struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); - struct video_priv *uc_priv = dev_get_uclass_priv(dev); - - uc_plat->base = 0x8f9c0000; - uc_plat->size = 800 * 480 * sizeof(u16); - uc_priv->xsize = 800; - uc_priv->ysize = 480; - uc_priv->bpix = VIDEO_BPP16; - - video_set_flush_dcache(dev, true); - - return 0; -} - -U_BOOT_DRIVER(rx51_video) = { - .name = "rx51_video", - .id = UCLASS_VIDEO, - .probe = rx51_video_probe, -}; - -/* - * Routine: twl4030_regulator_set_mode - * Description: Set twl4030 regulator mode over i2c powerbus. - */ -static void twl4030_regulator_set_mode(u8 id, u8 mode) -{ - u16 msg = MSG_SINGULAR(DEV_GRP_P1, id, mode); - twl4030_i2c_write_u8(TWL4030_CHIP_PM_MASTER, - TWL4030_PM_MASTER_PB_WORD_MSB, msg >> 8); - twl4030_i2c_write_u8(TWL4030_CHIP_PM_MASTER, - TWL4030_PM_MASTER_PB_WORD_LSB, msg & 0xff); -} - -static void omap3_emu_romcode_call(u32 service_id, u32 *parameters) -{ - u32 i, num_params = *parameters; - u32 *sram_scratch_space = (u32 *)OMAP3_PUBLIC_SRAM_SCRATCH_AREA; - - /* - * copy the parameters to an un-cached area to avoid coherency - * issues - */ - for (i = 0; i < num_params; i++) { - __raw_writel(*parameters, sram_scratch_space); - parameters++; - sram_scratch_space++; - } - - /* Now make the PPA call */ - do_omap3_emu_romcode_call(service_id, OMAP3_PUBLIC_SRAM_SCRATCH_AREA); -} - -void omap3_set_aux_cr_secure(u32 acr) -{ - struct emu_hal_params_rx51 emu_romcode_params = { 0, }; - - emu_romcode_params.num_params = 2; - emu_romcode_params.param1 = acr; - - omap3_emu_romcode_call(OMAP3_EMU_HAL_API_WRITE_ACR, - (u32 *)&emu_romcode_params); -} - -/* - * Routine: omap3_update_aux_cr_secure_rx51 - * Description: Modify the contents Auxiliary Control Register. - * Parameters: - * set_bits - bits to set in ACR - * clr_bits - bits to clear in ACR - */ -static void omap3_update_aux_cr_secure_rx51(u32 set_bits, u32 clear_bits) -{ - u32 acr; - - /* Read ACR */ - asm volatile ("mrc p15, 0, %0, c1, c0, 1" : "=r" (acr)); - acr &= ~clear_bits; - acr |= set_bits; - omap3_set_aux_cr_secure(acr); -} - -/* - * Routine: misc_init_r - * Description: Configure board specific parts. - */ -int misc_init_r(void) -{ - struct udevice *dev; - char buf[12]; - u8 state; - - /* disable lp5523 led */ - if (i2c_get_chip_for_busnum(1, 0x32, 1, &dev) == 0) - dm_i2c_reg_write(dev, 0x00, 0x00); - - /* initialize twl4030 power managment */ - twl4030_power_init(); - twl4030_power_mmc_init(0); - twl4030_power_mmc_init(1); - - /* set VSIM to 1.8V */ - twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VSIM_DEDICATED, - TWL4030_PM_RECEIVER_VSIM_VSEL_18, - TWL4030_PM_RECEIVER_VSIM_DEV_GRP, - TWL4030_PM_RECEIVER_DEV_GRP_P1); - - /* store I2C access state */ - twl4030_i2c_read_u8(TWL4030_CHIP_PM_MASTER, TWL4030_PM_MASTER_PB_CFG, - &state); - - /* enable I2C access to powerbus (needed for twl4030 regulator) */ - twl4030_i2c_write_u8(TWL4030_CHIP_PM_MASTER, TWL4030_PM_MASTER_PB_CFG, - 0x02); - - /* set VAUX3, VSIM and VMMC1 state to active - enable eMMC memory */ - twl4030_regulator_set_mode(RES_VAUX3, RES_STATE_ACTIVE); - twl4030_regulator_set_mode(RES_VSIM, RES_STATE_ACTIVE); - twl4030_regulator_set_mode(RES_VMMC1, RES_STATE_ACTIVE); - - /* restore I2C access state */ - twl4030_i2c_write_u8(TWL4030_CHIP_PM_MASTER, TWL4030_PM_MASTER_PB_CFG, - state); - - /* set env variable attkernaddr for relocated kernel */ - sprintf(buf, "%#x", KERNEL_ADDRESS); - env_set("attkernaddr", buf); - - /* initialize omap tags */ - init_omap_tags(); - - /* reuse atags from previous bootloader */ - reuse_atags(); - - omap_die_id_display(); - print_cpuinfo(); - - /* - * Cortex-A8(r1p0..r1p2) errata 430973 workaround - * Set IBE bit in Auxiliary Control Register - * - * Call this routine only on real secure device - * Qemu does not implement secure PPA and crash - */ - if (get_device_type() == HS_DEVICE) - omap3_update_aux_cr_secure_rx51(1 << 6, 0); - - return 0; -} - -static unsigned long int twl_wd_time; /* last time of watchdog reset */ -static unsigned long int twl_i2c_lock; - -/* - * Routine: rx51_watchdog_reset - * Description: Reset timeout of twl4030 watchdog. - */ -static int rx51_watchdog_reset(struct udevice *dev) -{ - u8 timeout = 0; - - /* do not reset watchdog too often - max every 4s */ - if (get_timer(twl_wd_time) < 4 * CONFIG_SYS_HZ) - return 0; - - /* localy lock twl4030 i2c bus */ - if (test_and_set_bit(0, &twl_i2c_lock)) - return 0; - - /* read actual watchdog timeout */ - twl4030_i2c_read_u8(TWL4030_CHIP_PM_RECEIVER, - TWL4030_PM_RECEIVER_WATCHDOG_CFG, &timeout); - - /* timeout 0 means watchdog is disabled */ - /* reset watchdog timeout to 31s (maximum) */ - if (timeout != 0) - twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, - TWL4030_PM_RECEIVER_WATCHDOG_CFG, 31); - - /* store last watchdog reset time */ - twl_wd_time = get_timer(0); - - /* localy unlock twl4030 i2c bus */ - test_and_clear_bit(0, &twl_i2c_lock); - - return 0; -} - -static int rx51_watchdog_start(struct udevice *dev, u64 timeout_ms, ulong flags) -{ - return 0; -} - -static int rx51_watchdog_probe(struct udevice *dev) -{ - return 0; -} - -static const struct wdt_ops rx51_watchdog_ops = { - .start = rx51_watchdog_start, - .reset = rx51_watchdog_reset, -}; - -U_BOOT_DRIVER(rx51_watchdog) = { - .name = "rx51_watchdog", - .id = UCLASS_WDT, - .ops = &rx51_watchdog_ops, - .probe = rx51_watchdog_probe, -}; - -/* - * TWL4030 keypad handler for cfb_console - */ - -static const char keymap[] = { - /* normal */ - 'q', 'o', 'p', ',', '\b', 0, 'a', 's', - 'w', 'd', 'f', 'g', 'h', 'j', 'k', 'l', - 'e', '.', 0, '\r', 0, 'z', 'x', 'c', - 'r', 'v', 'b', 'n', 'm', ' ', 0, 0, - 't', 0, 0, 0, 0, 0, 0, 0, - 'y', 0, 0, 0, 0, 0, 0, 0, - 'u', 0, 0, 0, 0, 0, 0, 0, - 'i', 5, 6, 0, 0, 0, 0, 0, - /* fn */ - '1', '9', '0', '=', '\b', 0, '*', '+', - '2', '#', '-', '_', '(', ')', '&', '!', - '3', '?', '^', '\r', 0, 156, '$', 238, - '4', '/', '\\', '"', '\'', '@', 0, '<', - '5', '|', '>', 0, 0, 0, 0, 0, - '6', 0, 0, 0, 0, 0, 0, 0, - '7', 0, 0, 0, 0, 0, 0, 0, - '8', 16, 17, 0, 0, 0, 0, 0, -}; - -static u8 keys[8]; -static u8 old_keys[8] = {0, 0, 0, 0, 0, 0, 0, 0}; -#define KEYBUF_SIZE 32 -static u8 keybuf[KEYBUF_SIZE]; -static u8 keybuf_head; -static u8 keybuf_tail; - -/* - * Routine: rx51_kp_start - * Description: Initialize HW keyboard. - */ -static int rx51_kp_start(struct udevice *dev) -{ - int ret = 0; - u8 ctrl; - ret = twl4030_i2c_read_u8(TWL4030_CHIP_KEYPAD, - TWL4030_KEYPAD_KEYP_CTRL_REG, &ctrl); - - if (ret) - return ret; - - /* turn on keyboard and use hardware scanning */ - ctrl |= TWL4030_KEYPAD_CTRL_KBD_ON; - ctrl |= TWL4030_KEYPAD_CTRL_SOFT_NRST; - ctrl |= TWL4030_KEYPAD_CTRL_SOFTMODEN; - ret |= twl4030_i2c_write_u8(TWL4030_CHIP_KEYPAD, - TWL4030_KEYPAD_KEYP_CTRL_REG, ctrl); - /* enable key event status */ - ret |= twl4030_i2c_write_u8(TWL4030_CHIP_KEYPAD, - TWL4030_KEYPAD_KEYP_IMR1, 0xfe); - /* enable interrupt generation on rising and falling */ - /* this is a workaround for qemu twl4030 emulation */ - ret |= twl4030_i2c_write_u8(TWL4030_CHIP_KEYPAD, - TWL4030_KEYPAD_KEYP_EDR, 0x57); - /* enable ISR clear on read */ - ret |= twl4030_i2c_write_u8(TWL4030_CHIP_KEYPAD, - TWL4030_KEYPAD_KEYP_SIH_CTRL, 0x05); - return 0; -} - -static void rx51_kp_fill(u8 k, u8 mods) -{ - /* check if some cursor key without meta fn key was pressed */ - if (!(mods & 2) && (k == 18 || k == 31 || k == 33 || k == 34)) { - keybuf[keybuf_tail++] = '\e'; - keybuf_tail %= KEYBUF_SIZE; - keybuf[keybuf_tail++] = '['; - keybuf_tail %= KEYBUF_SIZE; - if (k == 18) /* up */ - keybuf[keybuf_tail++] = 'A'; - else if (k == 31) /* left */ - keybuf[keybuf_tail++] = 'D'; - else if (k == 33) /* down */ - keybuf[keybuf_tail++] = 'B'; - else if (k == 34) /* right */ - keybuf[keybuf_tail++] = 'C'; - keybuf_tail %= KEYBUF_SIZE; - return; - } - - if (mods & 2) { /* fn meta key was pressed */ - k = keymap[k+64]; - } else { - k = keymap[k]; - if (mods & 1) { /* ctrl key was pressed */ - if (k >= 'a' && k <= 'z') - k -= 'a' - 1; - } - if (mods & 4) { /* shift key was pressed */ - if (k >= 'a' && k <= 'z') - k += 'A' - 'a'; - else if (k == '.') - k = ':'; - else if (k == ',') - k = ';'; - } - } - keybuf[keybuf_tail++] = k; - keybuf_tail %= KEYBUF_SIZE; -} - -/* - * Routine: rx51_kp_tstc - * Description: Test if key was pressed (from buffer). - */ -static int rx51_kp_tstc(struct udevice *dev) -{ - u8 c, r, dk, i; - u8 intr; - u8 mods; - - /* localy lock twl4030 i2c bus */ - if (test_and_set_bit(0, &twl_i2c_lock)) - return 0; - - /* twl4030 remembers up to 2 events */ - for (i = 0; i < 2; i++) { - - /* check interrupt register for events */ - twl4030_i2c_read_u8(TWL4030_CHIP_KEYPAD, - TWL4030_KEYPAD_KEYP_ISR1 + (2 * i), &intr); - - /* no event */ - if (!(intr&1)) - continue; - - /* read the key state */ - twl4030_i2c_read(TWL4030_CHIP_KEYPAD, - TWL4030_KEYPAD_FULL_CODE_7_0, keys, 8); - - /* cut out modifier keys from the keystate */ - mods = keys[4] >> 4; - keys[4] &= 0x0f; - - /* space key is indicated by two different bits */ - keys[3] |= (keys[3] & (1 << 6)) >> 1; - keys[3] &= ~(1 << 6); - - for (c = 0; c < 8; c++) { - - /* get newly pressed keys only */ - dk = ((keys[c] ^ old_keys[c])&keys[c]); - old_keys[c] = keys[c]; - - /* fill the keybuf */ - for (r = 0; r < 8; r++) { - if (dk&1) - rx51_kp_fill((c*8)+r, mods); - dk = dk >> 1; - } - - } - - } - - /* localy unlock twl4030 i2c bus */ - test_and_clear_bit(0, &twl_i2c_lock); - - return (KEYBUF_SIZE + keybuf_tail - keybuf_head)%KEYBUF_SIZE; -} - -/* - * Routine: rx51_kp_getc - * Description: Get last pressed key (from buffer). - */ -static int rx51_kp_getc(struct udevice *dev) -{ - keybuf_head %= KEYBUF_SIZE; - while (!rx51_kp_tstc(dev)) - schedule(); - return keybuf[keybuf_head++]; -} - -static int rx51_kp_probe(struct udevice *dev) -{ - struct keyboard_priv *uc_priv = dev_get_uclass_priv(dev); - struct stdio_dev *sdev = &uc_priv->sdev; - - strcpy(sdev->name, "keyboard"); - return input_stdio_register(sdev); -} - -static const struct keyboard_ops rx51_kp_ops = { - .start = rx51_kp_start, - .tstc = rx51_kp_tstc, - .getc = rx51_kp_getc, -}; - -U_BOOT_DRIVER(rx51_kp) = { - .name = "rx51_kp", - .id = UCLASS_KEYBOARD, - .probe = rx51_kp_probe, - .ops = &rx51_kp_ops, -}; - -static const struct mmc_config rx51_mmc_cfg = { - .host_caps = MMC_MODE_4BIT | MMC_MODE_HS_52MHz | MMC_MODE_HS, - .f_min = 400000, - .f_max = 52000000, - .b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT, - .voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195, -}; - -static const struct omap_hsmmc_plat rx51_mmc[] = { - { rx51_mmc_cfg, (struct hsmmc *)OMAP_HSMMC1_BASE }, - { rx51_mmc_cfg, (struct hsmmc *)OMAP_HSMMC2_BASE }, -}; - -U_BOOT_DRVINFOS(rx51_mmc) = { - { "omap_hsmmc", &rx51_mmc[0] }, - { "omap_hsmmc", &rx51_mmc[1] }, -}; - -static const struct omap_i2c_plat rx51_i2c[] = { - { I2C_BASE1, 100000, OMAP_I2C_REV_V1 }, - { I2C_BASE2, 100000, OMAP_I2C_REV_V1 }, - { I2C_BASE3, 100000, OMAP_I2C_REV_V1 }, -}; - -U_BOOT_DRVINFOS(rx51_i2c) = { - { "i2c_omap", &rx51_i2c[0] }, - { "i2c_omap", &rx51_i2c[1] }, - { "i2c_omap", &rx51_i2c[2] }, -}; - -U_BOOT_DRVINFOS(rx51_watchdog) = { - { "rx51_watchdog" }, -}; - -U_BOOT_DRVINFOS(rx51_video) = { - { "rx51_video" }, -}; - -U_BOOT_DRVINFOS(rx51_kp) = { - { "rx51_kp" }, -}; - -static const struct ns16550_plat rx51_serial = { - .base = CFG_SYS_NS16550_COM3, - .reg_shift = 2, - .clock = CFG_SYS_NS16550_CLK, - .fcr = UART_FCR_DEFVAL, -}; - -U_BOOT_DRVINFOS(rx51_uart) = { - { "omap_serial", &rx51_serial }, -}; diff --git a/board/nokia/rx51/tag_omap.h b/board/nokia/rx51/tag_omap.h deleted file mode 100644 index b99d6b7..0000000 --- a/board/nokia/rx51/tag_omap.h +++ /dev/null @@ -1,294 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * (C) Copyright 2011-2012 - * Pali Rohár <pali@kernel.org> - * - * (C) Copyright 2011 - * marcel@mesa.nl, Mesa Consulting B.V. - * - * (C) Copyright 2004-2005 - * Nokia Corporation - */ - - -/* - * Code copied from maemo kernel 2.6.28 file - * arch/arm/plat-omap/include/mach/board.h - * - * Information structures for board-specific data - * - * Copyright (C) 2004 Nokia Corporation - * Written by Juha Yrjölä <juha.yrjola@nokia.com> - */ - -/* Different peripheral ids */ -#define OMAP_TAG_CLOCK 0x4f01 -#define OMAP_TAG_SERIAL_CONSOLE 0x4f03 -#define OMAP_TAG_USB 0x4f04 -#define OMAP_TAG_LCD 0x4f05 -#define OMAP_TAG_GPIO_SWITCH 0x4f06 -#define OMAP_TAG_UART 0x4f07 -#define OMAP_TAG_FBMEM 0x4f08 -#define OMAP_TAG_STI_CONSOLE 0x4f09 -#define OMAP_TAG_CAMERA_SENSOR 0x4f0a -#define OMAP_TAG_PARTITION 0x4f0b -#define OMAP_TAG_TEA5761 0x4f10 -#define OMAP_TAG_TMP105 0x4f11 - -#define OMAP_TAG_BOOT_REASON 0x4f80 -#define OMAP_TAG_FLASH_PART_STR 0x4f81 -#define OMAP_TAG_VERSION_STR 0x4f82 - -#define OMAP_TAG_NOKIA_BT 0x4e01 -#define OMAP_TAG_WLAN_CX3110X 0x4e02 -#define OMAP_TAG_CBUS 0x4e03 -#define OMAP_TAG_EM_ASIC_BB5 0x4e04 - - -struct omap_clock_config { - /* 0 for 12 MHz, 1 for 13 MHz and 2 for 19.2 MHz */ - u8 system_clock_type; -}; - -struct omap_serial_console_config { - u8 console_uart; - u32 console_speed; -}; - -struct omap_sti_console_config { - unsigned enable:1; - u8 channel; -}; - -struct omap_usb_config { - /* Configure drivers according to the connectors on your board: - * - "A" connector (rectagular) - * ... for host/OHCI use, set "register_host". - * - "B" connector (squarish) or "Mini-B" - * ... for device/gadget use, set "register_dev". - * - "Mini-AB" connector (very similar to Mini-B) - * ... for OTG use as device OR host, initialize "otg" - */ - unsigned register_host:1; - unsigned register_dev:1; - u8 otg; /* port number, 1-based: usb1 == 2 */ - - u8 hmc_mode; - - /* implicitly true if otg: host supports remote wakeup? */ - u8 rwc; - - /* signaling pins used to talk to transceiver on usbN: - * 0 == usbN unused - * 2 == usb0-only, using internal transceiver - * 3 == 3 wire bidirectional - * 4 == 4 wire bidirectional - * 6 == 6 wire unidirectional (or TLL) - */ - u8 pins[3]; -}; - -struct omap_lcd_config { - char panel_name[16]; - char ctrl_name[16]; - s16 nreset_gpio; - u8 data_lines; -}; - -struct omap_fbmem_config { - u32 start; - u32 size; -}; - -struct omap_gpio_switch_config { - char name[12]; - u16 gpio; - u8 flags:4; - u8 type:4; - unsigned int key_code:24; /* Linux key code */ -}; - -struct omap_uart_config { - /* Bit field of UARTs present; bit 0 --> UART1 */ - unsigned int enabled_uarts; -}; - -struct omap_tea5761_config { - u16 enable_gpio; -}; - -struct omap_partition_config { - char name[16]; - unsigned int size; - unsigned int offset; - /* same as in include/linux/mtd/partitions.h */ - unsigned int mask_flags; -}; - -struct omap_flash_part_str_config { - char part_table[0]; -}; - -struct omap_boot_reason_config { - char reason_str[12]; -}; - -struct omap_version_config { - char component[12]; - char version[12]; -}; - -/* - * Code copied from maemo kernel 2.6.28 file - * arch/arm/plat-omap/include/mach/board-nokia.h - * - * Information structures for Nokia-specific board config data - * - * Copyright (C) 2005 Nokia Corporation - */ - -struct omap_bluetooth_config { - u8 chip_type; - u8 bt_wakeup_gpio; - u8 host_wakeup_gpio; - u8 reset_gpio; - u8 bt_uart; - u8 bd_addr[6]; - u8 bt_sysclk; -}; - -struct omap_wlan_cx3110x_config { - u8 chip_type; - u8 reserverd; - s16 power_gpio; - s16 irq_gpio; - s16 spi_cs_gpio; -}; - -struct omap_cbus_config { - s16 clk_gpio; - s16 dat_gpio; - s16 sel_gpio; -}; - -struct omap_em_asic_bb5_config { - s16 retu_irq_gpio; - s16 tahvo_irq_gpio; -}; - -/* - * omap_tag handling - * - * processing omap tag structures - * - * Copyright (C) 2011 marcel@mesa.nl, Mesa Consulting B.V. - * Copyright (C) 2012 Pali Rohár <pali@kernel.org> - */ - -/* TI OMAP specific information */ -#define ATAG_BOARD 0x414f4d50 - -struct tag_omap_header { - u16 tag; - u16 size; -}; - -struct tag_omap { - struct tag_omap_header hdr; - union { - struct omap_clock_config clock; - struct omap_serial_console_config serial_console; - struct omap_sti_console_config sti_console; - struct omap_usb_config usb; - struct omap_lcd_config lcd; - struct omap_fbmem_config fbmem; - struct omap_gpio_switch_config gpio_switch; - struct omap_uart_config uart; - struct omap_tea5761_config tea5761; - struct omap_partition_config partition; - struct omap_flash_part_str_config flash_part_str; - struct omap_boot_reason_config boot_reason; - struct omap_version_config version; - struct omap_bluetooth_config bluetooth; - struct omap_wlan_cx3110x_config wlan_cx3110x; - struct omap_cbus_config cbus; - struct omap_em_asic_bb5_config em_asic_bb5; - } u; -}; - -#define tag_omap_next(t) ((struct tag_omap *)((u8 *)(t) + \ - (t)->hdr.size + sizeof(struct tag_omap_header))) - -#define OMAP_TAG_HEADER_CONFIG(config, type) \ - .hdr.tag = config, \ - .hdr.size = sizeof(struct type) - -#define OMAP_TAG_UART_CONFIG(p1) \ - { \ - OMAP_TAG_HEADER_CONFIG(OMAP_TAG_UART, omap_uart_config), \ - .u.uart.enabled_uarts = p1, \ - } - -#define OMAP_TAG_SERIAL_CONSOLE_CONFIG(p1, p2) \ - { \ - OMAP_TAG_HEADER_CONFIG(OMAP_TAG_SERIAL_CONSOLE, \ - omap_serial_console_config), \ - .u.serial_console.console_uart = p1, \ - .u.serial_console.console_speed = p2, \ - } - -#define OMAP_TAG_LCD_CONFIG(p1, p2, p3, p4) \ - { \ - OMAP_TAG_HEADER_CONFIG(OMAP_TAG_LCD, omap_lcd_config), \ - .u.lcd.panel_name = p1, \ - .u.lcd.ctrl_name = p2, \ - .u.lcd.nreset_gpio = p3, \ - .u.lcd.data_lines = p4, \ - } - -#define OMAP_TAG_GPIO_SWITCH_CONFIG(p1, p2, p3, p4, p5) \ - { \ - OMAP_TAG_HEADER_CONFIG(OMAP_TAG_GPIO_SWITCH, \ - omap_gpio_switch_config), \ - .u.gpio_switch.name = p1, \ - .u.gpio_switch.gpio = p2, \ - .u.gpio_switch.flags = p3, \ - .u.gpio_switch.type = p4, \ - .u.gpio_switch.key_code = p5, \ - } - -#define OMAP_TAG_WLAN_CX3110X_CONFIG(p1, p2, p3, p4, p5) \ - { \ - OMAP_TAG_HEADER_CONFIG(OMAP_TAG_WLAN_CX3110X, \ - omap_wlan_cx3110x_config), \ - .u.wlan_cx3110x.chip_type = p1, \ - .u.wlan_cx3110x.reserverd = p2, \ - .u.wlan_cx3110x.power_gpio = p3, \ - .u.wlan_cx3110x.irq_gpio = p4, \ - .u.wlan_cx3110x.spi_cs_gpio = p5, \ - } - -#define OMAP_TAG_PARTITION_CONFIG(p1, p2, p3, p4) \ - { \ - OMAP_TAG_HEADER_CONFIG(OMAP_TAG_PARTITION, \ - omap_partition_config), \ - .u.partition.name = p1, \ - .u.partition.size = p2, \ - .u.partition.offset = p3, \ - .u.partition.mask_flags = p4, \ - } - -#define OMAP_TAG_BOOT_REASON_CONFIG(p1) \ - { \ - OMAP_TAG_HEADER_CONFIG(OMAP_TAG_BOOT_REASON, \ - omap_boot_reason_config), \ - .u.boot_reason.reason_str = p1, \ - } - -#define OMAP_TAG_VERSION_STR_CONFIG(p1, p2) \ - { \ - OMAP_TAG_HEADER_CONFIG(OMAP_TAG_VERSION_STR, \ - omap_version_config), \ - .u.version.component = p1, \ - .u.version.version = p2, \ - } diff --git a/board/starfive/visionfive2/starfive_visionfive2.c b/board/starfive/visionfive2/starfive_visionfive2.c index 05d8d2d..78e118d 100644 --- a/board/starfive/visionfive2/starfive_visionfive2.c +++ b/board/starfive/visionfive2/starfive_visionfive2.c @@ -7,12 +7,14 @@ #include <common.h> #include <cpu_func.h> #include <dm.h> +#include <fdt_support.h> #include <env.h> #include <asm/arch/eeprom.h> #include <asm/io.h> #include <asm/sections.h> #include <linux/bitops.h> +DECLARE_GLOBAL_DATA_PTR; #define JH7110_L2_PREFETCHER_BASE_ADDR 0x2030000 #define JH7110_L2_PREFETCHER_HART_OFFSET 0x2000 #define FDTFILE_VISIONFIVE2_1_2A \ @@ -90,3 +92,8 @@ void *board_fdt_blob_setup(int *err) return (ulong *)_end; } + +int ft_board_setup(void *blob, struct bd_info *bd) +{ + return fdt_fixup_memory(blob, 0x40000000, gd->ram_size); +} diff --git a/board/starfive/visionfive2/visionfive2-i2c-eeprom.c b/board/starfive/visionfive2/visionfive2-i2c-eeprom.c index befe788..c334d98 100644 --- a/board/starfive/visionfive2/visionfive2-i2c-eeprom.c +++ b/board/starfive/visionfive2/visionfive2-i2c-eeprom.c @@ -504,7 +504,7 @@ int mac_read_from_eeprom(void) } // 1, setup ethaddr env - eth_env_set_enetaddr("eth0addr", pbuf.eeprom.atom4.data.mac0_addr); + eth_env_set_enetaddr("ethaddr", pbuf.eeprom.atom4.data.mac0_addr); eth_env_set_enetaddr("eth1addr", pbuf.eeprom.atom4.data.mac1_addr); /** diff --git a/board/storopack/smegw01/smegw01.env b/board/storopack/smegw01/smegw01.env index 1263dda..93de866 100644 --- a/board/storopack/smegw01/smegw01.env +++ b/board/storopack/smegw01/smegw01.env @@ -48,13 +48,8 @@ commit_mmc= saveenv; fi; console=ttymxc0 -fdt_addr=0x83000000 -fdtfile=imx7d-smegw01.dtb -fit_addr=0x88000000 -image=fitImage -loadaddr=0x80800000 loadbootpart=mmc partconf 1 boot_part -loadimage=load mmc ${mmcdev}:${gpt_partition_entry} ${fit_addr} boot/${image} +loadimage=load mmc ${mmcdev}:${gpt_partition_entry} loadpart=gpt setenv mmc ${mmcdev} rootfs-${mmcpart_committed} mmcargs= setenv bootargs console=${console},${baudrate} root=/dev/mmcblk${mmcdev}p${gpt_partition_entry} rootwait rw SM_ROOT_DEV=${mmcdev} SM_ROOT_PART=${gpt_partition_entry} SM_BOOT_PART=${boot_part} @@ -71,8 +66,13 @@ mmcboot= else run altbootcmd; fi; +#ifdef CONFIG_SYS_BOOT_LOCKED + hab_auth_img_or_fail ${fileaddr} ${filesize}; +#else + hab_auth_img ${fileaddr} ${filesize}; +#endif run mmcargs; - if bootm ${fit_addr}; then + if bootm; then ; else run altbootcmd; diff --git a/board/technexion/pico-imx7d/MAINTAINERS b/board/technexion/pico-imx7d/MAINTAINERS index 325e173..5dccac4 100644 --- a/board/technexion/pico-imx7d/MAINTAINERS +++ b/board/technexion/pico-imx7d/MAINTAINERS @@ -1,5 +1,4 @@ TechNexion PICO-IMX7D board -M: Vanessa Maegima <vanessa.maegima@nxp.com> M: Otavio Salvador <otavio@ossystems.com.br> S: Maintained F: board/technexion/pico-imx7d/ diff --git a/board/ti/dra7xx/README b/board/ti/dra7xx/README deleted file mode 100644 index 533da01..0000000 --- a/board/ti/dra7xx/README +++ /dev/null @@ -1,26 +0,0 @@ -Summary -======= - -This document covers various features of the 'dra7xx_evm' build and some -related uses. - -eMMC boot partition use -======================= - -It is possible, depending on SYSBOOT configuration to boot from the eMMC -boot partitions using (name depending on documentation referenced) -Alternative Boot operation mode or Boot Sequence Option 1/2. In this -example we load MLO and u-boot.img from the build into DDR and then use -'mmc bootbus' to set the required rate (see TRM) and 'mmc partconfig' to -set boot0 as the boot device. -U-Boot # setenv autoload no -U-Boot # usb start -U-Boot # dhcp -U-Boot # mmc dev 1 1 -U-Boot # tftp ${loadaddr} dra7xx/MLO -U-Boot # mmc write ${loadaddr} 0 100 -U-Boot # tftp ${loadaddr} dra7xx/u-boot.img -U-Boot # mmc write ${loadaddr} 300 400 -U-Boot # mmc bootbus 1 2 0 2 -U-Boot # mmc partconf 1 1 1 0 -U-Boot # mmc rst-function 1 1 diff --git a/board/ti/ks2_evm/README b/board/ti/ks2_evm/README deleted file mode 100644 index ff0ec5a..0000000 --- a/board/ti/ks2_evm/README +++ /dev/null @@ -1,194 +0,0 @@ -U-Boot port for Texas Instruments Keystone II EVM boards -======================================================== - -Author: Murali Karicheri <m-karicheri2@ti.com> - -This README has information on the U-Boot port for K2HK, K2E, and K2L EVM boards. -Documentation for this board can be found at -http://www.advantech.com/Support/TI-EVM/EVMK2HX_sd.aspx -https://www.einfochips.com/index.php/partnerships/texas-instruments/k2e-evm.html -https://www.einfochips.com/index.php/partnerships/texas-instruments/k2l-evm.html - -The K2HK board is based on Texas Instruments Keystone2 family of SoCs: K2H, K2K. -More details on these SoCs are available at company websites - K2K: http://www.ti.com/product/tci6638k2k - K2H: http://www.ti.com/product/tci6638k2h - -The K2E SoC details are available at - http://www.ti.com/lit/ds/symlink/66ak2e05.pdf - -The K2L SoC details are available at - http://www.ti.com/lit/ds/symlink/tci6630k2l.pdf - -The K2G SoC details are available at - http://www.ti.com/lit/ds/symlink/66ak2g02.pdf - -Board configuration: -==================== - -Some of the peripherals that are configured by U-Boot -+------+-------+-------+-----------+-----------+-------+-------+----+ -| |DDR3 |NAND |MSM SRAM |ETH ports |UART |I2C |SPI | -+------+-------+-------+-----------+-----------+-------+-------+----+ -|K2HK |2 |512MB |6MB |4(2) |2 |3 |3 | -|K2E |4 |512MB |2MB |8(2) |2 |3 |3 | -|K2L |2 |512MB |2MB |4(2) |4 |3 |3 | -|K2G |2 |256MB |1MB |1 |1 |1 |1 | -+------+-------+-------+-----------+-----------+-------+-------+----+ - -There are only 2 eth port installed on the boards. - -There are separate PLLs to drive clocks to Tetris ARM and Peripherals. -To bring up SMP Linux on this board, there is a boot monitor -code that will be installed in MSMC SRAM. There is command available -to install this image from U-Boot. - -The port related files can be found at following folders - keystone2 SoC related files: arch/arm/cpu/armv7/keystone/ - EVMs board files: board/ti/k2s_evm/ - -Board configuration files: -include/configs/k2hk_evm.h -include/configs/k2e_evm.h -include/configs/k2l_evm.h -include/configs/k2g_evm.h - -As U-Boot is migrating to Kconfig there is also board defconfig files -configs/k2e_evm_defconfig -configs/k2hk_evm_defconfig -configs/k2l_evm_defconfig -configs/k2g_evm_defconfig - -Supported boot modes: - - SPI NOR boot - - AEMIF NAND boot (K2E, K2L and K2HK) - - UART boot - - MMC boot (Only on K2G) - -Supported image formats: - - u-boot.bin: for loading and running u-boot.bin through - Texas Instruments code composure studio (CCS) and for UART boot. - - u-boot-spi.gph: gpimage for programming SPI NOR flash for SPI NOR boot - - MLO: gpimage for programming NAND flash for NAND boot, MMC boot. - -Build instructions: -=================== -Examples for k2hk, for k2e, k2l and k2g just replace k2hk prefix accordingly. -Don't forget to add CROSS_COMPILE. - -To build u-boot.bin, u-boot-spi.gph, MLO: - >make k2hk_evm_defconfig - >make - -Load and Run U-Boot on keystone EVMs using CCS -========================================= - -Need Code Composer Studio (CCS) installed on a PC to load and run u-boot.bin -on EVM. See instructions at below link for installing CCS on a Windows PC. -http://processors.wiki.ti.com/index.php/MCSDK_UG_Chapter_Getting_Started# -Installing_Code_Composer_Studio -Use u-boot.bin from the build folder for loading and running U-Boot binary -on EVM. Follow instructions at -K2HK http://processors.wiki.ti.com/index.php/EVMK2H_Hardware_Setup -K2E http://processors.wiki.ti.com/index.php/EVMK2E_Hardware_Setup -K2L http://processors.wiki.ti.com/index.php/TCIEVMK2L_Hardware_Setup -K2G http://processors.wiki.ti.com/index.php/66AK2G02_GP_EVM_Hardware_Setup - -to configure SW1 dip switch to use "No Boot/JTAG DSP Little Endian Boot Mode" -and Power ON the EVM. Follow instructions to connect serial port of EVM to -PC and start TeraTerm or Hyper Terminal. - -Start CCS on a Windows machine and Launch Target -configuration as instructed at http://processors.wiki.ti.com/index.php/ -MCSDK_UG_Chapter_Exploring#Loading_and_Running_U-Boot_on_EVM_through_CCS. -The instructions provided in the above link uses a script for -loading the U-Boot binary on the target EVM. Instead do the following:- - -1. Right click to "Texas Instruments XDS2xx USB Emulator_0/CortexA15_1 core (D - is connected: Unknown)" at the debug window (This is created once Target - configuration is launched) and select "Connect Target". -2. Once target connect is successful, choose Tools->Load Memory option from the - top level menu. At the Load Memory window, choose the file u-boot.bin - through "Browse" button and click "next >" button. In the next window, enter - Start address as 0xc000000, choose Type-size "32 bits" and click "Finish" - button. -3. Click View -> Registers from the top level menu to view registers window. -4. From Registers, window expand "Core Registers" to view PC. Edit PC value - to be 0xc000000. From the "Run" top level menu, select "Free Run" -5. The U-Boot prompt is shown at the Tera Term/ Hyper terminal console as - below and type any key to stop autoboot as instructed := - -U-Boot 2014.04-rc1-00201-gc215b5a (Mar 21 2014 - 12:47:59) - -I2C: ready -Detected SO-DIMM [SQR-SD3T-2G1333SED] -DRAM: 1.1 GiB -NAND: 512 MiB -Net: K2HK_EMAC -Warning: K2HK_EMAC using MAC address from net device -, K2HK_EMAC1, K2HK_EMAC2, K2HK_EMAC3 -Hit any key to stop autoboot: 0 - -SPI NOR Flash programming instructions -====================================== -U-Boot image can be flashed to first 512KB of the NOR flash using following -instructions: - -1. Start CCS and run U-Boot as described above. -2. Suspend Target. Select Run -> Suspend from top level menu - CortexA15_1 (Free Running)" -3. Load u-boot-spi.gph binary from build folder on to DDR address 0x87000000 - through CCS as described in step 2 of "Load and Run U-Boot on K2HK/K2E/K2L - EVM using CCS", but using address 0x87000000. -4. Free Run the target as described earlier (step 4) to get U-Boot prompt -5. At the U-Boot console type following to setup U-Boot environment variables. - setenv addr_uboot 0x87000000 - setenv filesize <size in hex of u-boot-spi.gph rounded to hex 0x10000> - run burn_uboot_spi - Once U-Boot prompt is available, Power OFF the EVM. Set the SW1 dip switch - to "SPI Little Endian Boot mode" as per instruction at - http://processors.wiki.ti.com/index.php/*_Hardware_Setup. -6. Power ON the EVM. The EVM now boots with U-Boot image on the NOR flash. - -AEMIF NAND Flash programming instructions -====================================== -U-Boot image can be flashed to first 1024KB of the NAND flash using following -instructions: - -1. Start CCS and run U-Boot as described above. -2. Suspend Target. Select Run -> Suspend from top level menu - CortexA15_1 (Free Running)" -3. Load MLO binary from build folder on to DDR address 0x87000000 - through CCS as described in step 2 of "Load and Run U-Boot on K2HK EVM - using CCS", but using address 0x87000000. -4. Free Run the target as described earlier (step 4) to get U-Boot prompt -5. At the U-Boot console type following to setup U-Boot environment variables. - setenv filesize <size in hex of MLO rounded to hex 0x10000> - run burn_uboot_nand - Once U-Boot prompt is available, Power OFF the EVM. Set the SW1 dip switch - to "ARM NAND Boot mode" as per instruction at - http://processors.wiki.ti.com/index.php/*_Hardware_Setup. -6. Power ON the EVM. The EVM now boots with U-Boot image on the NAND flash. - -Load and Run U-Boot on keystone EVMs using UART download -======================================================== - -Open BMC and regular UART terminals. - -1. On the regular UART port start xmodem transfer of the u-boot.bin -2. Using BMC terminal set the ARM-UART bootmode and reboot the EVM - BMC> bootmode #4 - MBC> reboot -3. When xmodem is complete you should see the U-Boot starts on the UART port - -Load and Run U-Boot on K2G EVMs using MMC -======================================================== - -Open BMC and regular UART terminals. - -1. Set the SW3 dip switch to "ARM MMC Boot mode" as per instruction at - http://processors.wiki.ti.com/index.php/66AK2G02_GP_EVM_Hardware_Setup -2. Create SD card partitions as per steps given in Hardware Setup Guide. -3. Copy MLO to Boot Partition. -4. Insert SD card and Power on the EVM. - The EVM now boots with U-Boot image from SD card. diff --git a/boot/expo_build.c b/boot/expo_build.c index bb33cc2..910f1b4 100644 --- a/boot/expo_build.c +++ b/boot/expo_build.c @@ -209,7 +209,7 @@ static void list_strings(struct build_info *info) /** * menu_build() - Build a menu and add it to a scene * - * See doc/developer/expo.rst for a description of the format + * See doc/develop/expo.rst for a description of the format * * @info: Build information * @node: Node containing the menu description @@ -282,7 +282,7 @@ static int menu_build(struct build_info *info, ofnode node, struct scene *scn, /** * obj_build() - Build an expo object and add it to a scene * - * See doc/developer/expo.rst for a description of the format + * See doc/develop/expo.rst for a description of the format * * @info: Build information * @node: Node containing the object description @@ -324,7 +324,7 @@ static int obj_build(struct build_info *info, ofnode node, struct scene *scn) /** * scene_build() - Build a scene and all its objects * - * See doc/developer/expo.rst for a description of the format + * See doc/develop/expo.rst for a description of the format * * @info: Build information * @node: Node containing the scene description diff --git a/cmd/tpm-v1.c b/cmd/tpm-v1.c index 3b95c95..1b1efcd 100644 --- a/cmd/tpm-v1.c +++ b/cmd/tpm-v1.c @@ -655,7 +655,7 @@ TPM_COMMAND_NO_ARG(tpm_physical_disable) static struct cmd_tbl tpm1_commands[] = { U_BOOT_CMD_MKENT(device, 0, 1, do_tpm_device, "", ""), U_BOOT_CMD_MKENT(info, 0, 1, do_tpm_info, "", ""), - U_BOOT_CMD_MKENT(init, 0, 1, do_tpm_autostart, "", ""), + U_BOOT_CMD_MKENT(autostart, 0, 1, do_tpm_autostart, "", ""), U_BOOT_CMD_MKENT(init, 0, 1, do_tpm_init, "", ""), U_BOOT_CMD_MKENT(startup, 0, 1, do_tpm_startup, "", ""), diff --git a/common/dlmalloc.c b/common/dlmalloc.c index ebf0f27..aa933bd 100644 --- a/common/dlmalloc.c +++ b/common/dlmalloc.c @@ -618,7 +618,7 @@ void mem_malloc_init(ulong start, ulong size) debug("using memory %#lx-%#lx for malloc()\n", mem_malloc_start, mem_malloc_end); -#ifdef CONFIG_SYS_MALLOC_CLEAR_ON_INIT +#if CONFIG_IS_ENABLED(SYS_MALLOC_CLEAR_ON_INIT) memset((void *)mem_malloc_start, 0x0, size); #endif } @@ -2139,7 +2139,7 @@ Void_t* cALLOc(n, elem_size) size_t n; size_t elem_size; /* check if expand_top called, in which case don't need to clear */ -#ifdef CONFIG_SYS_MALLOC_CLEAR_ON_INIT +#if CONFIG_IS_ENABLED(SYS_MALLOC_CLEAR_ON_INIT) #if MORECORE_CLEARS mchunkptr oldtop = top; INTERNAL_SIZE_T oldtopsize = chunksize(top); @@ -2170,7 +2170,7 @@ Void_t* cALLOc(n, elem_size) size_t n; size_t elem_size; csz = chunksize(p); -#ifdef CONFIG_SYS_MALLOC_CLEAR_ON_INIT +#if CONFIG_IS_ENABLED(SYS_MALLOC_CLEAR_ON_INIT) #if MORECORE_CLEARS if (p == oldtop && csz > oldtopsize) { diff --git a/common/spl/spl_blk_fs.c b/common/spl/spl_blk_fs.c index eb6f526..ea5d1a5 100644 --- a/common/spl/spl_blk_fs.c +++ b/common/spl/spl_blk_fs.c @@ -53,7 +53,7 @@ int spl_blk_load_image(struct spl_image_info *spl_image, blk_desc = blk_get_devnum_by_uclass_id(uclass_id, devnum); if (!blk_desc) { printf("blk desc for %d %d not found\n", uclass_id, devnum); - goto out; + return -ENODEV; } blk_show_device(uclass_id, devnum); diff --git a/common/spl/spl_opensbi.c b/common/spl/spl_opensbi.c index 9e98a56..0df6116 100644 --- a/common/spl/spl_opensbi.c +++ b/common/spl/spl_opensbi.c @@ -44,11 +44,12 @@ static int spl_opensbi_find_uboot_node(void *blob, int *uboot_node) return -ENODEV; } -void spl_invoke_opensbi(struct spl_image_info *spl_image) +void __noreturn spl_invoke_opensbi(struct spl_image_info *spl_image) { int ret, uboot_node; ulong uboot_entry; - void (*opensbi_entry)(ulong hartid, ulong dtb, ulong info); + typedef void __noreturn (*opensbi_entry_t)(ulong hartid, ulong dtb, ulong info); + opensbi_entry_t opensbi_entry; if (!spl_image->fdt_addr) { pr_err("No device tree specified in SPL image\n"); @@ -75,7 +76,7 @@ void spl_invoke_opensbi(struct spl_image_info *spl_image) opensbi_info.options = CONFIG_SPL_OPENSBI_SCRATCH_OPTIONS; opensbi_info.boot_hart = gd->arch.boot_hart; - opensbi_entry = (void (*)(ulong, ulong, ulong))spl_image->entry_point; + opensbi_entry = (opensbi_entry_t)spl_image->entry_point; invalidate_icache_all(); #ifdef CONFIG_SPL_SMP diff --git a/configs/CMPC885_defconfig b/configs/CMPC885_defconfig index 54873da..24592a2 100644 --- a/configs/CMPC885_defconfig +++ b/configs/CMPC885_defconfig @@ -3,7 +3,6 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x2000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="cmpc885" -CONFIG_SYS_PROMPT="S3K> " CONFIG_SYS_MONITOR_LEN=327680 CONFIG_SYS_CLK_FREQ=132000000 CONFIG_ENV_ADDR=0x40004000 @@ -35,6 +34,7 @@ CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="run flashboot" CONFIG_MISC_INIT_R=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="S3K> " # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_BOOTM_PLAN9 is not set diff --git a/configs/CMPCPRO_defconfig b/configs/CMPCPRO_defconfig index d817274..6d7dfff 100644 --- a/configs/CMPCPRO_defconfig +++ b/configs/CMPCPRO_defconfig @@ -5,7 +5,6 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="cmpcpro" -CONFIG_SYS_PROMPT="MPC_PRO> " CONFIG_SYS_MONITOR_LEN=393216 CONFIG_SYS_CLK_FREQ=66666667 CONFIG_ENV_ADDR=0x400e0000 @@ -119,6 +118,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOARD_EARLY_INIT_R=y CONFIG_MISC_INIT_R=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MPC_PRO> " # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_BOOTM_PLAN9 is not set diff --git a/configs/MCR3000_defconfig b/configs/MCR3000_defconfig index 2bae14b..52be89d 100644 --- a/configs/MCR3000_defconfig +++ b/configs/MCR3000_defconfig @@ -3,7 +3,6 @@ CONFIG_TEXT_BASE=0x4000000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="mcr3000" -CONFIG_SYS_PROMPT="S3K> " CONFIG_SYS_MONITOR_LEN=327680 CONFIG_SYS_CLK_FREQ=132000000 CONFIG_SYS_LOAD_ADDR=0x200000 @@ -36,6 +35,7 @@ CONFIG_BOOTCOMMAND="run flashboot" CONFIG_MISC_INIT_R=y CONFIG_HUSH_PARSER=y # CONFIG_AUTO_COMPLETE is not set +CONFIG_SYS_PROMPT="S3K> " CONFIG_SYS_PBSIZE=278 # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/ad401_defconfig b/configs/ad401_defconfig index 529e553..31752cc 100644 --- a/configs/ad401_defconfig +++ b/configs/ad401_defconfig @@ -5,7 +5,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x00200000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="meson-a1-ad401" -CONFIG_SYS_PROMPT="ad401 # " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_MESON_A1=y CONFIG_DEBUG_UART_BASE=0xfe001c00 @@ -19,6 +18,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTCOMMAND="run storeboot" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_PROMPT="ad401 # " # CONFIG_CMD_BDI is not set # CONFIG_CMD_IMI is not set CONFIG_CMD_GPIO=y diff --git a/configs/ae350_rv32_defconfig b/configs/ae350_rv32_defconfig index 06a683d..38ab1d0 100644 --- a/configs/ae350_rv32_defconfig +++ b/configs/ae350_rv32_defconfig @@ -6,7 +6,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xfffe80 CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_DEFAULT_DEVICE_TREE="ae350_32" -CONFIG_SYS_PROMPT="RISC-V # " CONFIG_SYS_MONITOR_LEN=786432 CONFIG_SYS_LOAD_ADDR=0x100000 CONFIG_TARGET_AE350=y @@ -17,6 +16,7 @@ CONFIG_BOOTDELAY=3 CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_SYS_PROMPT="RISC-V # " CONFIG_SYS_PBSIZE=1050 CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_CMD_IMLS=y diff --git a/configs/ae350_rv32_spl_defconfig b/configs/ae350_rv32_spl_defconfig index 75e55ba..b29193a 100644 --- a/configs/ae350_rv32_spl_defconfig +++ b/configs/ae350_rv32_spl_defconfig @@ -6,7 +6,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x10000000 CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_DEFAULT_DEVICE_TREE="ae350_32" -CONFIG_SYS_PROMPT="RISC-V # " CONFIG_SYS_MONITOR_LEN=786432 CONFIG_SPL_SYS_MALLOC_F_LEN=0x100000 CONFIG_SPL=y @@ -26,6 +25,7 @@ CONFIG_SPL_MAX_SIZE=0x100000 CONFIG_SPL_BSS_START_ADDR=0x4000000 CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_CACHE=y +CONFIG_SYS_PROMPT="RISC-V # " CONFIG_SYS_PBSIZE=1050 CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_CMD_IMLS=y diff --git a/configs/ae350_rv32_spl_xip_defconfig b/configs/ae350_rv32_spl_xip_defconfig index c2221b8..c023b68 100644 --- a/configs/ae350_rv32_spl_xip_defconfig +++ b/configs/ae350_rv32_spl_xip_defconfig @@ -7,7 +7,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x10000000 CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_DEFAULT_DEVICE_TREE="ae350_32" CONFIG_SPL_TEXT_BASE=0x80000000 -CONFIG_SYS_PROMPT="RISC-V # " CONFIG_SYS_MONITOR_LEN=786432 CONFIG_SPL_SYS_MALLOC_F_LEN=0x100000 CONFIG_SPL=y @@ -27,6 +26,7 @@ CONFIG_SPL_MAX_SIZE=0x100000 CONFIG_SPL_BSS_START_ADDR=0x4000000 CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_CACHE=y +CONFIG_SYS_PROMPT="RISC-V # " CONFIG_SYS_PBSIZE=1050 CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_CMD_IMLS=y diff --git a/configs/ae350_rv32_xip_defconfig b/configs/ae350_rv32_xip_defconfig index 6d19400..6d04936 100644 --- a/configs/ae350_rv32_xip_defconfig +++ b/configs/ae350_rv32_xip_defconfig @@ -6,7 +6,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xfffe80 CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_DEFAULT_DEVICE_TREE="ae350_32" -CONFIG_SYS_PROMPT="RISC-V # " CONFIG_SYS_MONITOR_LEN=786432 CONFIG_SYS_LOAD_ADDR=0x100000 CONFIG_TARGET_AE350=y @@ -18,6 +17,7 @@ CONFIG_BOOTDELAY=3 CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_SYS_PROMPT="RISC-V # " CONFIG_SYS_PBSIZE=1050 CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_CMD_IMLS=y diff --git a/configs/ae350_rv64_defconfig b/configs/ae350_rv64_defconfig index 0d7f0a5..5b465f7 100644 --- a/configs/ae350_rv64_defconfig +++ b/configs/ae350_rv64_defconfig @@ -6,7 +6,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xfffd70 CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_DEFAULT_DEVICE_TREE="ae350_64" -CONFIG_SYS_PROMPT="RISC-V # " CONFIG_SYS_LOAD_ADDR=0x100000 CONFIG_TARGET_AE350=y CONFIG_ARCH_RV64I=y @@ -17,6 +16,7 @@ CONFIG_BOOTDELAY=3 CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_SYS_PROMPT="RISC-V # " CONFIG_SYS_PBSIZE=1050 CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_CMD_IMLS=y diff --git a/configs/ae350_rv64_spl_defconfig b/configs/ae350_rv64_spl_defconfig index 6a72b5a..3133f4b 100644 --- a/configs/ae350_rv64_spl_defconfig +++ b/configs/ae350_rv64_spl_defconfig @@ -6,7 +6,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x10000000 CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_DEFAULT_DEVICE_TREE="ae350_64" -CONFIG_SYS_PROMPT="RISC-V # " CONFIG_SPL_SYS_MALLOC_F_LEN=0x100000 CONFIG_SPL=y CONFIG_SYS_LOAD_ADDR=0x100000 @@ -26,6 +25,7 @@ CONFIG_SPL_MAX_SIZE=0x100000 CONFIG_SPL_BSS_START_ADDR=0x4000000 CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_CACHE=y +CONFIG_SYS_PROMPT="RISC-V # " CONFIG_SYS_PBSIZE=1050 CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_CMD_IMLS=y diff --git a/configs/ae350_rv64_spl_xip_defconfig b/configs/ae350_rv64_spl_xip_defconfig index 43581c7..eb5b8e7 100644 --- a/configs/ae350_rv64_spl_xip_defconfig +++ b/configs/ae350_rv64_spl_xip_defconfig @@ -7,7 +7,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x10000000 CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_DEFAULT_DEVICE_TREE="ae350_64" CONFIG_SPL_TEXT_BASE=0x80000000 -CONFIG_SYS_PROMPT="RISC-V # " CONFIG_SPL_SYS_MALLOC_F_LEN=0x100000 CONFIG_SPL=y CONFIG_SYS_LOAD_ADDR=0x100000 @@ -27,6 +26,7 @@ CONFIG_SPL_MAX_SIZE=0x100000 CONFIG_SPL_BSS_START_ADDR=0x4000000 CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_CACHE=y +CONFIG_SYS_PROMPT="RISC-V # " CONFIG_SYS_PBSIZE=1050 CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_CMD_IMLS=y diff --git a/configs/ae350_rv64_xip_defconfig b/configs/ae350_rv64_xip_defconfig index 02d7694..11f683f 100644 --- a/configs/ae350_rv64_xip_defconfig +++ b/configs/ae350_rv64_xip_defconfig @@ -6,7 +6,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xfffd70 CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_DEFAULT_DEVICE_TREE="ae350_64" -CONFIG_SYS_PROMPT="RISC-V # " CONFIG_SYS_LOAD_ADDR=0x100000 CONFIG_TARGET_AE350=y CONFIG_ARCH_RV64I=y @@ -18,6 +17,7 @@ CONFIG_BOOTDELAY=3 CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_SYS_PROMPT="RISC-V # " CONFIG_SYS_PBSIZE=1050 CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_CMD_IMLS=y diff --git a/configs/am335x_shc_defconfig b/configs/am335x_shc_defconfig index 51b25fd..85c5826 100644 --- a/configs/am335x_shc_defconfig +++ b/configs/am335x_shc_defconfig @@ -10,7 +10,6 @@ CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x7000 CONFIG_DEFAULT_DEVICE_TREE="am335x-shc" CONFIG_AM33XX=y -CONFIG_SYS_PROMPT="U-Boot# " CONFIG_TARGET_AM335X_SHC=y CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -47,6 +46,7 @@ CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y CONFIG_SPL_YMODEM_SUPPORT=y # CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC is not set +CONFIG_SYS_PROMPT="U-Boot# " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=1049 CONFIG_SYS_BOOTM_LEN=0x1000000 diff --git a/configs/am335x_shc_ict_defconfig b/configs/am335x_shc_ict_defconfig index 5766f71..7f2d9e6 100644 --- a/configs/am335x_shc_ict_defconfig +++ b/configs/am335x_shc_ict_defconfig @@ -10,7 +10,6 @@ CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x7000 CONFIG_DEFAULT_DEVICE_TREE="am335x-shc" CONFIG_AM33XX=y -CONFIG_SYS_PROMPT="U-Boot# " CONFIG_TARGET_AM335X_SHC=y CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -45,6 +44,7 @@ CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y CONFIG_SPL_YMODEM_SUPPORT=y # CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC is not set +CONFIG_SYS_PROMPT="U-Boot# " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=1049 CONFIG_SYS_BOOTM_LEN=0x1000000 diff --git a/configs/am335x_shc_netboot_defconfig b/configs/am335x_shc_netboot_defconfig index 5073efa..a2ab9e1 100644 --- a/configs/am335x_shc_netboot_defconfig +++ b/configs/am335x_shc_netboot_defconfig @@ -10,7 +10,6 @@ CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x7000 CONFIG_DEFAULT_DEVICE_TREE="am335x-shc" CONFIG_AM33XX=y -CONFIG_SYS_PROMPT="U-Boot# " CONFIG_TARGET_AM335X_SHC=y CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -49,6 +48,7 @@ CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y CONFIG_SPL_YMODEM_SUPPORT=y # CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC is not set +CONFIG_SYS_PROMPT="U-Boot# " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=1049 CONFIG_SYS_BOOTM_LEN=0x1000000 diff --git a/configs/am335x_shc_sdboot_defconfig b/configs/am335x_shc_sdboot_defconfig index f35df6c..5933035 100644 --- a/configs/am335x_shc_sdboot_defconfig +++ b/configs/am335x_shc_sdboot_defconfig @@ -10,7 +10,6 @@ CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x7000 CONFIG_DEFAULT_DEVICE_TREE="am335x-shc" CONFIG_AM33XX=y -CONFIG_SYS_PROMPT="U-Boot# " CONFIG_TARGET_AM335X_SHC=y CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -48,6 +47,7 @@ CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y CONFIG_SPL_YMODEM_SUPPORT=y # CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC is not set +CONFIG_SYS_PROMPT="U-Boot# " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=1049 CONFIG_SYS_BOOTM_LEN=0x1000000 diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig index fcb0b3d..c514b52 100644 --- a/configs/am3517_evm_defconfig +++ b/configs/am3517_evm_defconfig @@ -12,7 +12,6 @@ CONFIG_DEFAULT_DEVICE_TREE="am3517-evm" CONFIG_SPL_TEXT_BASE=0x40200000 CONFIG_TARGET_AM3517_EVM=y CONFIG_EMIF4=y -CONFIG_SYS_PROMPT="AM3517_EVM # " CONFIG_SYS_MONITOR_LEN=262144 CONFIG_SPL_SYS_MALLOC_F_LEN=0x2500 CONFIG_SPL=y @@ -40,6 +39,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700 CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500 CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200 # CONFIG_SPL_POWER is not set +CONFIG_SYS_PROMPT="AM3517_EVM # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=1054 # CONFIG_CMD_IMI is not set diff --git a/configs/am57xx_hs_evm_usb_defconfig b/configs/am57xx_hs_evm_usb_defconfig index 9ed59ac..fe11169 100644 --- a/configs/am57xx_hs_evm_usb_defconfig +++ b/configs/am57xx_hs_evm_usb_defconfig @@ -94,7 +94,6 @@ CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_MII=y CONFIG_DRIVER_TI_CPSW=y -CONFIG_PHY=y CONFIG_PIPE3_PHY=y CONFIG_OMAP_USB2_PHY=y CONFIG_DM_PMIC=y diff --git a/configs/am65x_evm_r5_usbmsc_defconfig b/configs/am65x_evm_r5_usbmsc_defconfig index 8da49c7..b6adcf6 100644 --- a/configs/am65x_evm_r5_usbmsc_defconfig +++ b/configs/am65x_evm_r5_usbmsc_defconfig @@ -122,6 +122,7 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y CONFIG_USB_DWC3_GENERIC=y +CONFIG_SPL_USB_DWC3_GENERIC=y CONFIG_USB_STORAGE=y CONFIG_SPL_USB_STORAGE=y CONFIG_USB_GADGET=y diff --git a/configs/amcore_defconfig b/configs/amcore_defconfig index ff6986d..ae7418d 100644 --- a/configs/amcore_defconfig +++ b/configs/amcore_defconfig @@ -5,7 +5,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x800 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_DEFAULT_DEVICE_TREE="amcore" -CONFIG_SYS_PROMPT="amcore $ " CONFIG_SYS_MONITOR_LEN=192512 CONFIG_SYS_LOAD_ADDR=0x20000 CONFIG_ENV_ADDR=0xFFC1F000 @@ -20,6 +19,7 @@ CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_SYS_BOOTPARAMS_LEN=65536 # CONFIG_CMDLINE_EDITING is not set # CONFIG_SYS_LONGHELP is not set +CONFIG_SYS_PROMPT="amcore $ " CONFIG_SYS_PBSIZE=282 # CONFIG_CMD_BOOTD is not set CONFIG_CMD_IMLS=y diff --git a/configs/ap121_defconfig b/configs/ap121_defconfig index 030eee2..50d2121 100644 --- a/configs/ap121_defconfig +++ b/configs/ap121_defconfig @@ -7,7 +7,6 @@ CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0x40000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DEFAULT_DEVICE_TREE="ap121" -CONFIG_SYS_PROMPT="ap121 # " CONFIG_DEBUG_UART_BASE=0xb8020000 CONFIG_DEBUG_UART_CLOCK=25000000 CONFIG_DEBUG_UART_BOARD_INIT=y @@ -25,6 +24,7 @@ CONFIG_BOOTCOMMAND="sf probe;mtdparts default;bootm 0x9f650000" CONFIG_DISPLAY_CPUINFO=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_MALLOC_BOOTPARAMS=y +CONFIG_SYS_PROMPT="ap121 # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/ap143_defconfig b/configs/ap143_defconfig index 817cd85..f82e2c5 100644 --- a/configs/ap143_defconfig +++ b/configs/ap143_defconfig @@ -8,7 +8,6 @@ CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0x40000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DEFAULT_DEVICE_TREE="ap143" -CONFIG_SYS_PROMPT="ap143 # " CONFIG_DEBUG_UART_BASE=0xb8020000 CONFIG_DEBUG_UART_CLOCK=25000000 CONFIG_DEBUG_UART_BOARD_INIT=y @@ -27,6 +26,7 @@ CONFIG_BOOTCOMMAND="sf probe;mtdparts default;bootm 0x9f680000" CONFIG_DISPLAY_CPUINFO=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_MALLOC_BOOTPARAMS=y +CONFIG_SYS_PROMPT="ap143 # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/ap152_defconfig b/configs/ap152_defconfig index 0bcd388..fc910ce 100644 --- a/configs/ap152_defconfig +++ b/configs/ap152_defconfig @@ -8,7 +8,6 @@ CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0x40000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DEFAULT_DEVICE_TREE="ap152" -CONFIG_SYS_PROMPT="ap152 # " CONFIG_DEBUG_UART_BASE=0xb8020000 CONFIG_DEBUG_UART_CLOCK=25000000 CONFIG_DEBUG_UART_BOARD_INIT=y @@ -27,6 +26,7 @@ CONFIG_BOOTCOMMAND="sf probe;mtdparts default;bootm 0x9f060000" CONFIG_DISPLAY_CPUINFO=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_MALLOC_BOOTPARAMS=y +CONFIG_SYS_PROMPT="ap152 # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/apalis-imx8_defconfig b/configs/apalis-imx8_defconfig index b726ee3..c668cef 100644 --- a/configs/apalis-imx8_defconfig +++ b/configs/apalis-imx8_defconfig @@ -13,7 +13,6 @@ CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-apalis" CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 CONFIG_TARGET_APALIS_IMX8=y -CONFIG_SYS_PROMPT="Apalis iMX8 # " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_LOAD_ADDR=0x95400000 CONFIG_SYS_MEMTEST_START=0x88000000 @@ -30,6 +29,7 @@ CONFIG_LOG=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_SYS_PROMPT="Apalis iMX8 # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2068 diff --git a/configs/apalis-tk1_defconfig b/configs/apalis-tk1_defconfig index fda85c2..6c80834 100644 --- a/configs/apalis-tk1_defconfig +++ b/configs/apalis-tk1_defconfig @@ -8,7 +8,6 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFFDE00 CONFIG_DEFAULT_DEVICE_TREE="tegra124-apalis" CONFIG_SPL_TEXT_BASE=0x80108000 -CONFIG_SYS_PROMPT="Apalis TK1 # " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SPL_STACK=0x800ffffc CONFIG_TEGRA124=y @@ -33,6 +32,7 @@ CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x80090000 CONFIG_SYS_SPL_MALLOC_SIZE=0x10000 +CONFIG_SYS_PROMPT="Apalis TK1 # " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_CBSIZE=1024 CONFIG_SYS_PBSIZE=1054 diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig index 5f0f781..6214b44 100644 --- a/configs/apalis_imx6_defconfig +++ b/configs/apalis_imx6_defconfig @@ -17,7 +17,6 @@ CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-apalis-eval" CONFIG_SPL_TEXT_BASE=0x00908000 -CONFIG_SYS_PROMPT="Apalis iMX6 # " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y @@ -43,6 +42,7 @@ CONFIG_MISC_INIT_R=y CONFIG_SYS_SPL_MALLOC=y CONFIG_SPL_DMA=y CONFIG_SPL_I2C=y +CONFIG_SYS_PROMPT="Apalis iMX6 # " CONFIG_SYS_MAXARGS=48 CONFIG_SYS_CBSIZE=1024 CONFIG_SYS_PBSIZE=1055 diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig index 83aab24..d902fc1 100644 --- a/configs/apalis_t30_defconfig +++ b/configs/apalis_t30_defconfig @@ -8,7 +8,6 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFFDE00 CONFIG_DEFAULT_DEVICE_TREE="tegra30-apalis" CONFIG_SPL_TEXT_BASE=0x80108000 -CONFIG_SYS_PROMPT="Apalis T30 # " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SPL_STACK=0x800ffffc CONFIG_TEGRA30=y @@ -28,6 +27,7 @@ CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x80090000 CONFIG_SYS_SPL_MALLOC_SIZE=0x10000 +CONFIG_SYS_PROMPT="Apalis T30 # " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_CBSIZE=1024 CONFIG_SYS_PBSIZE=1054 diff --git a/configs/arbel_evb_defconfig b/configs/arbel_evb_defconfig index ce7f235..8c32b4b 100644 --- a/configs/arbel_evb_defconfig +++ b/configs/arbel_evb_defconfig @@ -9,7 +9,6 @@ CONFIG_ENV_OFFSET=0x3C0000 CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="nuvoton-npcm845-evb" -CONFIG_SYS_PROMPT="U-Boot>" CONFIG_DM_RESET=y # CONFIG_PSCI_RESET is not set CONFIG_ARCH_NPCM8XX=y @@ -21,6 +20,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="run common_bootargs; run romboot" CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot>" CONFIG_SYS_MAXARGS=32 CONFIG_SYS_BOOTM_LEN=0x1400000 CONFIG_CMD_FUSE=y diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig index b3d1257..d444ee9 100644 --- a/configs/arndale_defconfig +++ b/configs/arndale_defconfig @@ -15,7 +15,6 @@ CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_OFFSET=0x86200 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-arndale" CONFIG_SPL_TEXT_BASE=0x02023400 -CONFIG_SYS_PROMPT="ARNDALE # " CONFIG_SPL=y CONFIG_IDENT_STRING=" for ARNDALE" CONFIG_SYS_LOAD_ADDR=0x43e00000 @@ -28,6 +27,7 @@ CONFIG_CONSOLE_MUX=y # CONFIG_SPL_FRAMEWORK is not set CONFIG_SPL_FOOTPRINT_LIMIT=y CONFIG_SPL_MAX_FOOTPRINT=0x3800 +CONFIG_SYS_PROMPT="ARNDALE # " CONFIG_SYS_PBSIZE=1024 CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y diff --git a/configs/astro_mcf5373l_defconfig b/configs/astro_mcf5373l_defconfig index f4dad3b..96441b0 100644 --- a/configs/astro_mcf5373l_defconfig +++ b/configs/astro_mcf5373l_defconfig @@ -4,7 +4,6 @@ CONFIG_SYS_MALLOC_LEN=0x20000 CONFIG_ENV_SIZE=0x8000 CONFIG_ENV_SECT_SIZE=0x8000 CONFIG_DEFAULT_DEVICE_TREE="astro_mcf5373l" -CONFIG_SYS_PROMPT="URMEL > " CONFIG_SYS_MONITOR_LEN=262144 CONFIG_SYS_LOAD_ADDR=0x20000 CONFIG_ENV_ADDR=0x1FF8000 @@ -20,6 +19,7 @@ CONFIG_MISC_INIT_R=y CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y # CONFIG_AUTO_COMPLETE is not set +CONFIG_SYS_PROMPT="URMEL > " CONFIG_SYS_PBSIZE=281 CONFIG_CMD_IMLS=y CONFIG_CMD_FPGA_LOADMK=y diff --git a/configs/at91sam9260ek_dataflash_cs0_defconfig b/configs/at91sam9260ek_dataflash_cs0_defconfig index 854d2de..598a9d5 100644 --- a/configs/at91sam9260ek_dataflash_cs0_defconfig +++ b/configs/at91sam9260ek_dataflash_cs0_defconfig @@ -13,7 +13,6 @@ CONFIG_ENV_OFFSET=0x4200 CONFIG_ENV_SECT_SIZE=0x210 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=132000000 CONFIG_DEBUG_UART_BOARD_INIT=y @@ -25,6 +24,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-( CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="sf probe 0:0; sf read 0x22000000 0x84000 0x294000; bootm 0x22000000" # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9260ek_dataflash_cs1_defconfig b/configs/at91sam9260ek_dataflash_cs1_defconfig index 1e219cf..3573c81 100644 --- a/configs/at91sam9260ek_dataflash_cs1_defconfig +++ b/configs/at91sam9260ek_dataflash_cs1_defconfig @@ -13,7 +13,6 @@ CONFIG_ENV_OFFSET=0x4200 CONFIG_ENV_SECT_SIZE=0x210 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=132000000 CONFIG_DEBUG_UART_BOARD_INIT=y @@ -25,6 +24,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-( CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="sf probe 0:1; sf read 0x22000000 0x84000 0x294000; bootm 0x22000000" # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9260ek_nandflash_defconfig b/configs/at91sam9260ek_nandflash_defconfig index 75520ad..51824f2 100644 --- a/configs/at91sam9260ek_nandflash_defconfig +++ b/configs/at91sam9260ek_nandflash_defconfig @@ -10,7 +10,6 @@ CONFIG_AT91SAM9260EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=132000000 CONFIG_DEBUG_UART_BOARD_INIT=y @@ -24,6 +23,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(boots CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="nand read 0x22000000 0x200000 0x300000; bootm" # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9261ek_dataflash_cs0_defconfig b/configs/at91sam9261ek_dataflash_cs0_defconfig index a398e6d..92b5886 100644 --- a/configs/at91sam9261ek_dataflash_cs0_defconfig +++ b/configs/at91sam9261ek_dataflash_cs0_defconfig @@ -12,7 +12,6 @@ CONFIG_ENV_OFFSET=0x4200 CONFIG_ENV_SECT_SIZE=0x210 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9261ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_DEBUG_UART_BOARD_INIT=y @@ -26,6 +25,7 @@ CONFIG_BOOTCOMMAND="sf probe 0; sf read 0x22000000 0x84000 0x294000; bootm 0x220 CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_RESET_PHY_R=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9261ek_dataflash_cs3_defconfig b/configs/at91sam9261ek_dataflash_cs3_defconfig index 1b464ff..4e61a67 100644 --- a/configs/at91sam9261ek_dataflash_cs3_defconfig +++ b/configs/at91sam9261ek_dataflash_cs3_defconfig @@ -12,7 +12,6 @@ CONFIG_ENV_OFFSET=0x4200 CONFIG_ENV_SECT_SIZE=0x210 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9261ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_DEBUG_UART_BOARD_INIT=y @@ -26,6 +25,7 @@ CONFIG_BOOTCOMMAND="sf probe 0:3; sf read 0x22000000 0x84000 0x294000; bootm 0x2 CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_RESET_PHY_R=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9261ek_nandflash_defconfig b/configs/at91sam9261ek_nandflash_defconfig index f232624..473e6ce 100644 --- a/configs/at91sam9261ek_nandflash_defconfig +++ b/configs/at91sam9261ek_nandflash_defconfig @@ -9,7 +9,6 @@ CONFIG_AT91SAM9261EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9261ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_DEBUG_UART_BOARD_INIT=y @@ -25,6 +24,7 @@ CONFIG_BOOTCOMMAND="nand read 0x22000000 0x200000 0x300000; bootm" CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_RESET_PHY_R=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9263ek_dataflash_cs0_defconfig b/configs/at91sam9263ek_dataflash_cs0_defconfig index 1498ade..1f016bc 100644 --- a/configs/at91sam9263ek_dataflash_cs0_defconfig +++ b/configs/at91sam9263ek_dataflash_cs0_defconfig @@ -12,7 +12,6 @@ CONFIG_ENV_OFFSET=0x4200 CONFIG_ENV_SECT_SIZE=0x210 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_DEBUG_UART_BASE=0xffffee00 CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_DEBUG_UART_BOARD_INIT=y @@ -27,6 +26,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_RESET_PHY_R=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9263ek_dataflash_defconfig b/configs/at91sam9263ek_dataflash_defconfig index 1498ade..1f016bc 100644 --- a/configs/at91sam9263ek_dataflash_defconfig +++ b/configs/at91sam9263ek_dataflash_defconfig @@ -12,7 +12,6 @@ CONFIG_ENV_OFFSET=0x4200 CONFIG_ENV_SECT_SIZE=0x210 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_DEBUG_UART_BASE=0xffffee00 CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_DEBUG_UART_BOARD_INIT=y @@ -27,6 +26,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_RESET_PHY_R=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9263ek_nandflash_defconfig b/configs/at91sam9263ek_nandflash_defconfig index 119117d..fa72c27 100644 --- a/configs/at91sam9263ek_nandflash_defconfig +++ b/configs/at91sam9263ek_nandflash_defconfig @@ -9,7 +9,6 @@ CONFIG_ATMEL_LEGACY=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_DEBUG_UART_BASE=0xffffee00 CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_DEBUG_UART_BOARD_INIT=y @@ -26,6 +25,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_RESET_PHY_R=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9263ek_norflash_boot_defconfig b/configs/at91sam9263ek_norflash_boot_defconfig index 18b06ba..3220812 100644 --- a/configs/at91sam9263ek_norflash_boot_defconfig +++ b/configs/at91sam9263ek_norflash_boot_defconfig @@ -11,7 +11,6 @@ CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_MONITOR_LEN=262144 CONFIG_DEBUG_UART_BASE=0xffffee00 CONFIG_DEBUG_UART_CLOCK=100000000 @@ -25,6 +24,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_RESET_PHY_R=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9263ek_norflash_defconfig b/configs/at91sam9263ek_norflash_defconfig index 05b69af..657153f 100644 --- a/configs/at91sam9263ek_norflash_defconfig +++ b/configs/at91sam9263ek_norflash_defconfig @@ -12,7 +12,6 @@ CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_MONITOR_LEN=262144 CONFIG_DEBUG_UART_BASE=0xffffee00 CONFIG_DEBUG_UART_CLOCK=100000000 @@ -26,6 +25,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_RESET_PHY_R=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9g10ek_dataflash_cs0_defconfig b/configs/at91sam9g10ek_dataflash_cs0_defconfig index 8559fee..f76d79e 100644 --- a/configs/at91sam9g10ek_dataflash_cs0_defconfig +++ b/configs/at91sam9g10ek_dataflash_cs0_defconfig @@ -12,7 +12,6 @@ CONFIG_ENV_OFFSET=0x4200 CONFIG_ENV_SECT_SIZE=0x210 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9261ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_DEBUG_UART_BOARD_INIT=y @@ -26,6 +25,7 @@ CONFIG_BOOTCOMMAND="sf probe 0; sf read 0x22000000 0x84000 0x294000; bootm 0x220 CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_RESET_PHY_R=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9g10ek_dataflash_cs3_defconfig b/configs/at91sam9g10ek_dataflash_cs3_defconfig index 0ca7739..36c7683 100644 --- a/configs/at91sam9g10ek_dataflash_cs3_defconfig +++ b/configs/at91sam9g10ek_dataflash_cs3_defconfig @@ -12,7 +12,6 @@ CONFIG_ENV_OFFSET=0x4200 CONFIG_ENV_SECT_SIZE=0x210 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9261ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_DEBUG_UART_BOARD_INIT=y @@ -26,6 +25,7 @@ CONFIG_BOOTCOMMAND="sf probe 0:3; sf read 0x22000000 0x84000 0x294000; bootm 0x2 CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_RESET_PHY_R=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9g10ek_nandflash_defconfig b/configs/at91sam9g10ek_nandflash_defconfig index 3b0180a..0cd803f 100644 --- a/configs/at91sam9g10ek_nandflash_defconfig +++ b/configs/at91sam9g10ek_nandflash_defconfig @@ -9,7 +9,6 @@ CONFIG_AT91SAM9G10=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9261ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_DEBUG_UART_BOARD_INIT=y @@ -25,6 +24,7 @@ CONFIG_BOOTCOMMAND="nand read 0x22000000 0x200000 0x300000; bootm" CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_RESET_PHY_R=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9g20ek_2mmc_defconfig b/configs/at91sam9g20ek_2mmc_defconfig index d1b0a2e..1ef502f 100644 --- a/configs/at91sam9g20ek_2mmc_defconfig +++ b/configs/at91sam9g20ek_2mmc_defconfig @@ -13,7 +13,6 @@ CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x2000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20ek_2mmc" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=132000000 CONFIG_DEBUG_UART_BOARD_INIT=y @@ -26,6 +25,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(boots CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="fatload mmc 0:1 0x22000000 uImage; bootm" # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9g20ek_2mmc_nandflash_defconfig b/configs/at91sam9g20ek_2mmc_nandflash_defconfig index 2f6e4fb..b34512b 100644 --- a/configs/at91sam9g20ek_2mmc_nandflash_defconfig +++ b/configs/at91sam9g20ek_2mmc_nandflash_defconfig @@ -11,7 +11,6 @@ CONFIG_AT91SAM9G20EK_2MMC=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20ek_2mmc" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=132000000 CONFIG_DEBUG_UART_BOARD_INIT=y @@ -25,6 +24,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(boots CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="nand read 0x22000000 0x200000 0x300000; bootm" # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9g20ek_dataflash_cs0_defconfig b/configs/at91sam9g20ek_dataflash_cs0_defconfig index 419d2c8..50d7d23 100644 --- a/configs/at91sam9g20ek_dataflash_cs0_defconfig +++ b/configs/at91sam9g20ek_dataflash_cs0_defconfig @@ -13,7 +13,6 @@ CONFIG_ENV_OFFSET=0x4200 CONFIG_ENV_SECT_SIZE=0x210 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=132000000 CONFIG_DEBUG_UART_BOARD_INIT=y @@ -25,6 +24,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-( CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="sf probe 0:0; sf read 0x22000000 0x84000 0x294000; bootm 0x22000000" # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9g20ek_dataflash_cs1_defconfig b/configs/at91sam9g20ek_dataflash_cs1_defconfig index 741ae96..8577409 100644 --- a/configs/at91sam9g20ek_dataflash_cs1_defconfig +++ b/configs/at91sam9g20ek_dataflash_cs1_defconfig @@ -13,7 +13,6 @@ CONFIG_ENV_OFFSET=0x4200 CONFIG_ENV_SECT_SIZE=0x210 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=132000000 CONFIG_DEBUG_UART_BOARD_INIT=y @@ -25,6 +24,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-( CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="sf probe 0:1; sf read 0x22000000 0x84000 0x294000; bootm 0x22000000" # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9g20ek_nandflash_defconfig b/configs/at91sam9g20ek_nandflash_defconfig index 6528cff..501f04b 100644 --- a/configs/at91sam9g20ek_nandflash_defconfig +++ b/configs/at91sam9g20ek_nandflash_defconfig @@ -10,7 +10,6 @@ CONFIG_AT91SAM9260EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=132000000 CONFIG_DEBUG_UART_BOARD_INIT=y @@ -24,6 +23,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(boots CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="nand read 0x22000000 0x200000 0x300000; bootm" # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9m10g45ek_mmc_defconfig b/configs/at91sam9m10g45ek_mmc_defconfig index 171f76c..ab48506 100644 --- a/configs/at91sam9m10g45ek_mmc_defconfig +++ b/configs/at91sam9m10g45ek_mmc_defconfig @@ -11,7 +11,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x70003f00 CONFIG_ENV_SIZE=0x4000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9m10g45ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_MONITOR_LEN=524288 CONFIG_DEBUG_UART_BASE=0xffffee00 CONFIG_DEBUG_UART_CLOCK=132000000 @@ -28,6 +27,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_RESET_PHY_R=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9m10g45ek_nandflash_defconfig b/configs/at91sam9m10g45ek_nandflash_defconfig index 45201c8..ea695a2 100644 --- a/configs/at91sam9m10g45ek_nandflash_defconfig +++ b/configs/at91sam9m10g45ek_nandflash_defconfig @@ -10,7 +10,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x70003f00 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9m10g45ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_MONITOR_LEN=524288 CONFIG_DEBUG_UART_BASE=0xffffee00 CONFIG_DEBUG_UART_CLOCK=132000000 @@ -28,6 +27,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_RESET_PHY_R=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9n12ek_mmc_defconfig b/configs/at91sam9n12ek_mmc_defconfig index 43cee7c..81d620f 100644 --- a/configs/at91sam9n12ek_mmc_defconfig +++ b/configs/at91sam9n12ek_mmc_defconfig @@ -10,7 +10,6 @@ CONFIG_SF_DEFAULT_SPEED=30000000 CONFIG_ENV_SIZE=0x4000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9n12ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_MONITOR_LEN=524288 CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=132000000 @@ -24,6 +23,7 @@ CONFIG_BOOTCOMMAND="setenv bootargs ${console} ${mtdparts} ${bootargs_mmc};fatlo CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 CONFIG_CMD_BOOTZ=y diff --git a/configs/at91sam9n12ek_nandflash_defconfig b/configs/at91sam9n12ek_nandflash_defconfig index daacc1c..a964c9a 100644 --- a/configs/at91sam9n12ek_nandflash_defconfig +++ b/configs/at91sam9n12ek_nandflash_defconfig @@ -9,7 +9,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x303f00 CONFIG_SF_DEFAULT_SPEED=30000000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9n12ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_MONITOR_LEN=524288 CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=132000000 @@ -24,6 +23,7 @@ CONFIG_BOOTCOMMAND="setenv bootargs ${console} ${mtdparts} ${bootargs_nand};nand CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 CONFIG_CMD_BOOTZ=y diff --git a/configs/at91sam9n12ek_spiflash_defconfig b/configs/at91sam9n12ek_spiflash_defconfig index fdf0683..b7598ab 100644 --- a/configs/at91sam9n12ek_spiflash_defconfig +++ b/configs/at91sam9n12ek_spiflash_defconfig @@ -12,7 +12,6 @@ CONFIG_ENV_OFFSET=0x5000 CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9n12ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_MONITOR_LEN=524288 CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=132000000 @@ -26,6 +25,7 @@ CONFIG_BOOTCOMMAND="setenv bootargs ${console} ${mtdparts} ${bootargs_nand};sf p CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 CONFIG_CMD_BOOTZ=y diff --git a/configs/at91sam9rlek_dataflash_defconfig b/configs/at91sam9rlek_dataflash_defconfig index 8daec28..1c655f2 100644 --- a/configs/at91sam9rlek_dataflash_defconfig +++ b/configs/at91sam9rlek_dataflash_defconfig @@ -12,7 +12,6 @@ CONFIG_ENV_OFFSET=0x4200 CONFIG_ENV_SECT_SIZE=0x210 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9rlek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_DEBUG_UART_BOARD_INIT=y @@ -26,6 +25,7 @@ CONFIG_BOOTCOMMAND="sf probe 0; sf read 0x22000000 0x84000 0x294000; bootm 0x220 CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9rlek_mmc_defconfig b/configs/at91sam9rlek_mmc_defconfig index bc5c9cf..c66a9b7 100644 --- a/configs/at91sam9rlek_mmc_defconfig +++ b/configs/at91sam9rlek_mmc_defconfig @@ -10,7 +10,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9rlek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_DEBUG_UART_BOARD_INIT=y @@ -25,6 +24,7 @@ CONFIG_BOOTCOMMAND="fatload mmc 0:1 0x21000000 at91sam9rlek.dtb; fatload mmc 0:1 CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9rlek_nandflash_defconfig b/configs/at91sam9rlek_nandflash_defconfig index 5ec0efc..c3950cd 100644 --- a/configs/at91sam9rlek_nandflash_defconfig +++ b/configs/at91sam9rlek_nandflash_defconfig @@ -9,7 +9,6 @@ CONFIG_ATMEL_LEGACY=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9rlek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_DEBUG_UART_BOARD_INIT=y @@ -25,6 +24,7 @@ CONFIG_BOOTCOMMAND="nand read 0x22000000 0x200000 0x600000; nand read 0x21000000 CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9x5ek_dataflash_defconfig b/configs/at91sam9x5ek_dataflash_defconfig index 11efdf1..50d775c 100644 --- a/configs/at91sam9x5ek_dataflash_defconfig +++ b/configs/at91sam9x5ek_dataflash_defconfig @@ -14,7 +14,6 @@ CONFIG_ENV_OFFSET=0x4200 CONFIG_ENV_SECT_SIZE=0x210 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9g35ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_MONITOR_LEN=524288 CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=132000000 @@ -31,6 +30,7 @@ CONFIG_BOOTCOMMAND="sf probe 0; sf read 0x22000000 0x84000 0x294000; bootm 0x220 CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 CONFIG_CMD_BOOTZ=y diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig index 4fa832d..3b80e17 100644 --- a/configs/at91sam9x5ek_mmc_defconfig +++ b/configs/at91sam9x5ek_mmc_defconfig @@ -12,7 +12,6 @@ CONFIG_SF_DEFAULT_SPEED=30000000 CONFIG_ENV_SIZE=0x4000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9g35ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_MONITOR_LEN=524288 CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=132000000 @@ -28,6 +27,7 @@ CONFIG_BOOTARGS="mem=128M console=ttyS0,115200 mtdparts=atmel_nand:8M(bootstrap/ CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 CONFIG_CMD_BOOTZ=y diff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig index 2992818..6e36e56 100644 --- a/configs/at91sam9x5ek_nandflash_defconfig +++ b/configs/at91sam9x5ek_nandflash_defconfig @@ -11,7 +11,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20003ef0 CONFIG_SF_DEFAULT_SPEED=30000000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9g35ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_MONITOR_LEN=524288 CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=132000000 @@ -30,6 +29,7 @@ CONFIG_BOOTCOMMAND="nand read 0x22000000 0x200000 0x600000; nand read 0x21000000 CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 CONFIG_CMD_BOOTZ=y diff --git a/configs/at91sam9x5ek_spiflash_defconfig b/configs/at91sam9x5ek_spiflash_defconfig index 7908705..2256fa3 100644 --- a/configs/at91sam9x5ek_spiflash_defconfig +++ b/configs/at91sam9x5ek_spiflash_defconfig @@ -14,7 +14,6 @@ CONFIG_ENV_OFFSET=0x5000 CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9g35ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_MONITOR_LEN=524288 CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=132000000 @@ -32,6 +31,7 @@ CONFIG_BOOTCOMMAND="sf probe 0; sf read 0x22000000 0x100000 0x300000; bootm 0x22 CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 CONFIG_CMD_BOOTZ=y diff --git a/configs/at91sam9xeek_dataflash_cs0_defconfig b/configs/at91sam9xeek_dataflash_cs0_defconfig index 854d2de..598a9d5 100644 --- a/configs/at91sam9xeek_dataflash_cs0_defconfig +++ b/configs/at91sam9xeek_dataflash_cs0_defconfig @@ -13,7 +13,6 @@ CONFIG_ENV_OFFSET=0x4200 CONFIG_ENV_SECT_SIZE=0x210 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=132000000 CONFIG_DEBUG_UART_BOARD_INIT=y @@ -25,6 +24,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-( CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="sf probe 0:0; sf read 0x22000000 0x84000 0x294000; bootm 0x22000000" # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9xeek_dataflash_cs1_defconfig b/configs/at91sam9xeek_dataflash_cs1_defconfig index 1e219cf..3573c81 100644 --- a/configs/at91sam9xeek_dataflash_cs1_defconfig +++ b/configs/at91sam9xeek_dataflash_cs1_defconfig @@ -13,7 +13,6 @@ CONFIG_ENV_OFFSET=0x4200 CONFIG_ENV_SECT_SIZE=0x210 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=132000000 CONFIG_DEBUG_UART_BOARD_INIT=y @@ -25,6 +24,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-( CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="sf probe 0:1; sf read 0x22000000 0x84000 0x294000; bootm 0x22000000" # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9xeek_nandflash_defconfig b/configs/at91sam9xeek_nandflash_defconfig index 75520ad..51824f2 100644 --- a/configs/at91sam9xeek_nandflash_defconfig +++ b/configs/at91sam9xeek_nandflash_defconfig @@ -10,7 +10,6 @@ CONFIG_AT91SAM9260EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=132000000 CONFIG_DEBUG_UART_BOARD_INIT=y @@ -24,6 +23,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(boots CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="nand read 0x22000000 0x200000 0x300000; bootm" # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/axm_defconfig b/configs/axm_defconfig index 5d6dd2a..d7d14cf 100644 --- a/configs/axm_defconfig +++ b/configs/axm_defconfig @@ -20,7 +20,6 @@ CONFIG_SPL_LDSCRIPT="arch/arm/cpu/u-boot-spl.lds" CONFIG_ENV_OFFSET=0x100000 CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20-taurus" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SPL_STACK=0x304000 CONFIG_SPL_SYS_MALLOC_F_LEN=0x1000 CONFIG_SPL=y @@ -57,6 +56,7 @@ CONFIG_SPL_NAND_SOFTECC=y CONFIG_SPL_NAND_BASE=y CONFIG_SPL_DM_SPI_FLASH=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/axs101_defconfig b/configs/axs101_defconfig index 22031f0..13d2706 100644 --- a/configs/axs101_defconfig +++ b/configs/axs101_defconfig @@ -7,7 +7,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80000f30 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="axs101" -CONFIG_SYS_PROMPT="AXS# " CONFIG_DEBUG_UART_BASE=0xe0022000 CONFIG_DEBUG_UART_CLOCK=33333333 CONFIG_SYS_CLK_FREQ=750000000 @@ -19,6 +18,7 @@ CONFIG_BOOTARGS="console=ttyS3,115200n8" CONFIG_BOARD_TYPES=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="AXS# " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=278 CONFIG_SYS_BOOTM_LEN=0x8000000 diff --git a/configs/axs103_defconfig b/configs/axs103_defconfig index 0757ddf..4dd25b1 100644 --- a/configs/axs103_defconfig +++ b/configs/axs103_defconfig @@ -7,7 +7,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80000f30 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="axs103" -CONFIG_SYS_PROMPT="AXS# " CONFIG_DEBUG_UART_BASE=0xe0022000 CONFIG_DEBUG_UART_CLOCK=33333333 CONFIG_SYS_CLK_FREQ=100000000 @@ -19,6 +18,7 @@ CONFIG_BOOTARGS="console=ttyS3,115200n8" CONFIG_BOARD_TYPES=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="AXS# " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=278 CONFIG_SYS_BOOTM_LEN=0x8000000 diff --git a/configs/bcm7260_defconfig b/configs/bcm7260_defconfig index 51e0a5d..b1219b8 100644 --- a/configs/bcm7260_defconfig +++ b/configs/bcm7260_defconfig @@ -9,7 +9,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0x814800 CONFIG_DEFAULT_DEVICE_TREE="bcm7xxx" -CONFIG_SYS_PROMPT="U-Boot>" CONFIG_ENV_OFFSET_REDUND=0x824800 CONFIG_SYS_LOAD_ADDR=0x02000000 CONFIG_FIT=y @@ -19,6 +18,7 @@ CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="fdt addr ${fdtcontroladdr};fdt move ${fdtcontroladdr} ${fdtsaveaddr};fdt addr ${fdtsaveaddr};" CONFIG_BOARD_LATE_INIT=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot>" CONFIG_SYS_MAXARGS=32 CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=536 diff --git a/configs/bcm7445_defconfig b/configs/bcm7445_defconfig index f5f1e8d..6013e51 100644 --- a/configs/bcm7445_defconfig +++ b/configs/bcm7445_defconfig @@ -10,7 +10,6 @@ CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0x1E0000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DEFAULT_DEVICE_TREE="bcm7xxx" -CONFIG_SYS_PROMPT="U-Boot>" CONFIG_ENV_OFFSET_REDUND=0x1F0000 CONFIG_SYS_LOAD_ADDR=0x02000000 CONFIG_FIT=y @@ -20,6 +19,7 @@ CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="fdt addr ${fdtcontroladdr};fdt move ${fdtcontroladdr} ${fdtsaveaddr};fdt addr ${fdtsaveaddr};" CONFIG_BOARD_LATE_INIT=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot>" CONFIG_SYS_MAXARGS=32 CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=536 diff --git a/configs/bcm968380gerg_ram_defconfig b/configs/bcm968380gerg_ram_defconfig index 4a4160d..8d86066 100644 --- a/configs/bcm968380gerg_ram_defconfig +++ b/configs/bcm968380gerg_ram_defconfig @@ -5,7 +5,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="brcm,bcm968380gerg" -CONFIG_SYS_PROMPT="bcm968380gerg # " CONFIG_DM_RESET=y CONFIG_SYS_LOAD_ADDR=0x80100000 CONFIG_ARCH_BMIPS=y @@ -21,6 +20,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DISPLAY_CPUINFO=y CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="bcm968380gerg # " CONFIG_SYS_MAXARGS=24 CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=545 diff --git a/configs/bcm_ns3_defconfig b/configs/bcm_ns3_defconfig index 40b3d89..d316012 100644 --- a/configs/bcm_ns3_defconfig +++ b/configs/bcm_ns3_defconfig @@ -9,7 +9,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x0 CONFIG_ENV_SIZE=0x80000 CONFIG_DEFAULT_DEVICE_TREE="ns3-board" -CONFIG_SYS_PROMPT="u-boot> " CONFIG_SYS_LOAD_ADDR=0x80080000 CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y @@ -26,6 +25,7 @@ CONFIG_SILENT_U_BOOT_ONLY=y # CONFIG_SILENT_CONSOLE_UPDATE_ON_SET is not set # CONFIG_DISPLAY_CPUINFO is not set CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="u-boot> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=1049 # CONFIG_SYS_XTRACE is not set diff --git a/configs/bcmns_defconfig b/configs/bcmns_defconfig index 3be6a37..593edaa 100644 --- a/configs/bcmns_defconfig +++ b/configs/bcmns_defconfig @@ -7,7 +7,6 @@ CONFIG_NR_DRAM_BANKS=2 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x00100000 CONFIG_DEFAULT_DEVICE_TREE="ns-board" -CONFIG_SYS_PROMPT="northstar> " CONFIG_IDENT_STRING="Broadcom Northstar" CONFIG_SYS_LOAD_ADDR=0x00008000 CONFIG_ENV_VARS_UBOOT_CONFIG=y @@ -21,6 +20,7 @@ CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="run bootcmd_dlink_dir8xxl" CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="northstar> " CONFIG_SYS_MAXARGS=64 CONFIG_CMD_BOOTZ=y CONFIG_CMD_SEAMA=y diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig index 0d8a74b..7684ae6 100644 --- a/configs/beaver_defconfig +++ b/configs/beaver_defconfig @@ -10,7 +10,6 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFFE000 CONFIG_DEFAULT_DEVICE_TREE="tegra30-beaver" CONFIG_SPL_TEXT_BASE=0x80108000 -CONFIG_SYS_PROMPT="Tegra30 (Beaver) # " CONFIG_SPL_STACK=0x800ffffc CONFIG_TEGRA30=y CONFIG_TARGET_BEAVER=y @@ -26,6 +25,7 @@ CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x80090000 CONFIG_SYS_SPL_MALLOC_SIZE=0x10000 +CONFIG_SYS_PROMPT="Tegra30 (Beaver) # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2084 # CONFIG_CMD_IMI is not set diff --git a/configs/bitmain_antminer_s9_defconfig b/configs/bitmain_antminer_s9_defconfig index 3995d41..161b44c 100644 --- a/configs/bitmain_antminer_s9_defconfig +++ b/configs/bitmain_antminer_s9_defconfig @@ -9,7 +9,6 @@ CONFIG_TEXT_BASE=0x4000000 CONFIG_ENV_OFFSET=0x300000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="bitmain-antminer-s9" -CONFIG_SYS_PROMPT="antminer> " CONFIG_SPL_STACK_R_ADDR=0x200000 CONFIG_SYS_BOOTCOUNT_ADDR=0xEFFFFF0 CONFIG_SPL_STACK=0xfffffe00 @@ -37,6 +36,7 @@ CONFIG_SPL_STACK_R=y CONFIG_SYS_SPL_MALLOC=y CONFIG_SYS_SPL_MALLOC_SIZE=0x2000000 CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="antminer> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=2075 CONFIG_CMD_BOOTZ=y diff --git a/configs/boston32r2_defconfig b/configs/boston32r2_defconfig index 5a8dc39..526dbbe 100644 --- a/configs/boston32r2_defconfig +++ b/configs/boston32r2_defconfig @@ -5,7 +5,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="img,boston" -CONFIG_SYS_PROMPT="boston # " CONFIG_SYS_LOAD_ADDR=0x88000000 CONFIG_ENV_ADDR=0xBFFE0000 CONFIG_TARGET_BOSTON=y @@ -21,6 +20,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_FIT_BEST_MATCH=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_SYS_PROMPT="boston # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=282 CONFIG_SYS_BOOTM_LEN=0x4000000 diff --git a/configs/boston32r2el_defconfig b/configs/boston32r2el_defconfig index ccc8360..1377cee 100644 --- a/configs/boston32r2el_defconfig +++ b/configs/boston32r2el_defconfig @@ -5,7 +5,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="img,boston" -CONFIG_SYS_PROMPT="boston # " CONFIG_SYS_LOAD_ADDR=0x88000000 CONFIG_ENV_ADDR=0xBFFE0000 CONFIG_TARGET_BOSTON=y @@ -22,6 +21,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_FIT_BEST_MATCH=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_SYS_PROMPT="boston # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=282 CONFIG_SYS_BOOTM_LEN=0x4000000 diff --git a/configs/boston32r6_defconfig b/configs/boston32r6_defconfig index fe7b280..77d8c03 100644 --- a/configs/boston32r6_defconfig +++ b/configs/boston32r6_defconfig @@ -5,7 +5,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="img,boston" -CONFIG_SYS_PROMPT="boston # " CONFIG_SYS_LOAD_ADDR=0x88000000 CONFIG_ENV_ADDR=0xBFFE0000 CONFIG_TARGET_BOSTON=y @@ -22,6 +21,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_FIT_BEST_MATCH=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_SYS_PROMPT="boston # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=282 CONFIG_SYS_BOOTM_LEN=0x4000000 diff --git a/configs/boston32r6el_defconfig b/configs/boston32r6el_defconfig index fc741aa..5dbcd13 100644 --- a/configs/boston32r6el_defconfig +++ b/configs/boston32r6el_defconfig @@ -5,7 +5,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="img,boston" -CONFIG_SYS_PROMPT="boston # " CONFIG_SYS_LOAD_ADDR=0x88000000 CONFIG_ENV_ADDR=0xBFFE0000 CONFIG_TARGET_BOSTON=y @@ -23,6 +22,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_FIT_BEST_MATCH=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_SYS_PROMPT="boston # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=282 CONFIG_SYS_BOOTM_LEN=0x4000000 diff --git a/configs/boston64r2_defconfig b/configs/boston64r2_defconfig index 41b8759..a93c6a7 100644 --- a/configs/boston64r2_defconfig +++ b/configs/boston64r2_defconfig @@ -5,7 +5,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="img,boston" -CONFIG_SYS_PROMPT="boston # " CONFIG_SYS_LOAD_ADDR=0xffffffff88000000 CONFIG_ENV_ADDR=0xFFFFFFFFBFFE0000 CONFIG_TARGET_BOSTON=y @@ -22,6 +21,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_FIT_BEST_MATCH=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_SYS_PROMPT="boston # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=282 CONFIG_SYS_BOOTM_LEN=0x4000000 diff --git a/configs/boston64r2el_defconfig b/configs/boston64r2el_defconfig index 3afc90b..57d0111 100644 --- a/configs/boston64r2el_defconfig +++ b/configs/boston64r2el_defconfig @@ -5,7 +5,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="img,boston" -CONFIG_SYS_PROMPT="boston # " CONFIG_SYS_LOAD_ADDR=0xffffffff88000000 CONFIG_ENV_ADDR=0xFFFFFFFFBFFE0000 CONFIG_TARGET_BOSTON=y @@ -23,6 +22,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_FIT_BEST_MATCH=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_SYS_PROMPT="boston # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=282 CONFIG_SYS_BOOTM_LEN=0x4000000 diff --git a/configs/boston64r6_defconfig b/configs/boston64r6_defconfig index da8cded..711d06c 100644 --- a/configs/boston64r6_defconfig +++ b/configs/boston64r6_defconfig @@ -5,7 +5,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="img,boston" -CONFIG_SYS_PROMPT="boston # " CONFIG_SYS_LOAD_ADDR=0xffffffff88000000 CONFIG_ENV_ADDR=0xFFFFFFFFBFFE0000 CONFIG_TARGET_BOSTON=y @@ -22,6 +21,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_FIT_BEST_MATCH=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_SYS_PROMPT="boston # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=282 CONFIG_SYS_BOOTM_LEN=0x4000000 diff --git a/configs/boston64r6el_defconfig b/configs/boston64r6el_defconfig index a5b72de..8a0b4c0 100644 --- a/configs/boston64r6el_defconfig +++ b/configs/boston64r6el_defconfig @@ -5,7 +5,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="img,boston" -CONFIG_SYS_PROMPT="boston # " CONFIG_SYS_LOAD_ADDR=0xffffffff88000000 CONFIG_ENV_ADDR=0xFFFFFFFFBFFE0000 CONFIG_TARGET_BOSTON=y @@ -23,6 +22,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_FIT_BEST_MATCH=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_SYS_PROMPT="boston # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=282 CONFIG_SYS_BOOTM_LEN=0x4000000 diff --git a/configs/bubblegum_96_defconfig b/configs/bubblegum_96_defconfig index bae2611..4ed956a 100644 --- a/configs/bubblegum_96_defconfig +++ b/configs/bubblegum_96_defconfig @@ -6,7 +6,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x1107ff00 CONFIG_ENV_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="bubblegum_96" -CONFIG_SYS_PROMPT="U-Boot => " CONFIG_MACH_S900=y CONFIG_IDENT_STRING="\nBubblegum-96" CONFIG_SYS_LOAD_ADDR=0x7ffc0 @@ -16,6 +15,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyOWL5,115200n8" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_PROMPT="U-Boot => " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=1051 CONFIG_SYS_BOOTM_LEN=0x800000 diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig index 4fe4621..a264ebe 100644 --- a/configs/cardhu_defconfig +++ b/configs/cardhu_defconfig @@ -9,7 +9,6 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFFE000 CONFIG_DEFAULT_DEVICE_TREE="tegra30-cardhu" CONFIG_SPL_TEXT_BASE=0x80108000 -CONFIG_SYS_PROMPT="Tegra30 (Cardhu) # " CONFIG_SPL_STACK=0x800ffffc CONFIG_TEGRA30=y CONFIG_TARGET_CARDHU=y @@ -25,6 +24,7 @@ CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x80090000 CONFIG_SYS_SPL_MALLOC_SIZE=0x10000 +CONFIG_SYS_PROMPT="Tegra30 (Cardhu) # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2084 # CONFIG_CMD_IMI is not set diff --git a/configs/cei-tk1-som_defconfig b/configs/cei-tk1-som_defconfig index b920ac2..8542399 100644 --- a/configs/cei-tk1-som_defconfig +++ b/configs/cei-tk1-som_defconfig @@ -10,7 +10,6 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFFE000 CONFIG_DEFAULT_DEVICE_TREE="tegra124-cei-tk1-som" CONFIG_SPL_TEXT_BASE=0x80108000 -CONFIG_SYS_PROMPT="Tegra124 (TK1-SOM) # " CONFIG_SPL_STACK=0x800ffffc CONFIG_TEGRA124=y CONFIG_TARGET_CEI_TK1_SOM=y @@ -29,6 +28,7 @@ CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x80090000 CONFIG_SYS_SPL_MALLOC_SIZE=0x10000 +CONFIG_SYS_PROMPT="Tegra124 (TK1-SOM) # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2086 # CONFIG_CMD_IMI is not set diff --git a/configs/cl-som-imx7_defconfig b/configs/cl-som-imx7_defconfig index 2277d19..503da92 100644 --- a/configs/cl-som-imx7_defconfig +++ b/configs/cl-som-imx7_defconfig @@ -13,7 +13,6 @@ CONFIG_SYS_I2C_MXC_I2C2=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx7d-sdb" CONFIG_TARGET_CL_SOM_IMX7=y -CONFIG_SYS_PROMPT="CL-SOM-iMX7 # " CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -37,6 +36,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x80 CONFIG_SPL_I2C=y CONFIG_SPL_SPI_LOAD=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="CL-SOM-iMX7 # " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=543 CONFIG_CMD_BOOTZ=y diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig index 56527da..3c0d8af 100644 --- a/configs/cm_fx6_defconfig +++ b/configs/cm_fx6_defconfig @@ -17,7 +17,6 @@ CONFIG_SYS_I2C_MXC_I2C2=y CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-cm-fx6" CONFIG_SPL_TEXT_BASE=0x00908000 -CONFIG_SYS_PROMPT="CM-FX6 # " CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -39,6 +38,7 @@ CONFIG_SPL_I2C=y CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000 CONFIG_SPL_WATCHDOG=y +CONFIG_SYS_PROMPT="CM-FX6 # " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=538 # CONFIG_CMD_XIMG is not set diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig index 12d010a..bc2ab1a 100644 --- a/configs/cm_t43_defconfig +++ b/configs/cm_t43_defconfig @@ -16,7 +16,6 @@ CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="am437x-cm-t43" CONFIG_SPL_TEXT_BASE=0x40300350 CONFIG_AM43XX=y -CONFIG_SYS_PROMPT="CM-T43 # " CONFIG_TARGET_CM_T43=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y @@ -46,6 +45,7 @@ CONFIG_SPL_DM_SPI_FLASH=y CONFIG_SPL_POWER=y CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000 +CONFIG_SYS_PROMPT="CM-T43 # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=1050 CONFIG_CMD_ASKENV=y diff --git a/configs/cobra5272_defconfig b/configs/cobra5272_defconfig index 3f9b51c..e28aae4 100644 --- a/configs/cobra5272_defconfig +++ b/configs/cobra5272_defconfig @@ -4,7 +4,6 @@ CONFIG_SYS_MALLOC_LEN=0x40000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="cobra5272" -CONFIG_SYS_PROMPT="COBRA > " CONFIG_SYS_MONITOR_LEN=131072 CONFIG_SYS_LOAD_ADDR=0x20000 CONFIG_ENV_ADDR=0xFFE04000 @@ -15,6 +14,7 @@ CONFIG_BOOTDELAY=5 CONFIG_SYS_MALLOC_BOOTPARAMS=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set +CONFIG_SYS_PROMPT="COBRA > " CONFIG_SYS_PBSIZE=281 CONFIG_CMD_IMLS=y # CONFIG_CMD_LOADB is not set diff --git a/configs/colibri-imx6ull-emmc_defconfig b/configs/colibri-imx6ull-emmc_defconfig index bd21559..2fead59 100644 --- a/configs/colibri-imx6ull-emmc_defconfig +++ b/configs/colibri-imx6ull-emmc_defconfig @@ -9,7 +9,6 @@ CONFIG_TARGET_COLIBRI_IMX6ULL=y CONFIG_DM_GPIO=y CONFIG_TARGET_COLIBRI_IMX6ULL_EMMC=y CONFIG_DEFAULT_DEVICE_TREE="imx6ull-colibri-emmc-eval-v3" -CONFIG_SYS_PROMPT="Colibri iMX6ULL # " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_LOAD_ADDR=0x84200000 CONFIG_SYS_MEMTEST_START=0x80000000 @@ -23,6 +22,7 @@ CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile imx6ull-colibri${variant}-$ CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_SYS_PROMPT="Colibri iMX6ULL # " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=547 # CONFIG_BOOTM_PLAN9 is not set diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig index 8cf62c2..5164374 100644 --- a/configs/colibri-imx6ull_defconfig +++ b/configs/colibri-imx6ull_defconfig @@ -10,7 +10,6 @@ CONFIG_TARGET_COLIBRI_IMX6ULL=y CONFIG_DM_GPIO=y CONFIG_TARGET_COLIBRI_IMX6ULL_NAND=y CONFIG_DEFAULT_DEVICE_TREE="imx6ull-colibri-eval-v3" -CONFIG_SYS_PROMPT="Colibri iMX6ULL # " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_LOAD_ADDR=0x84200000 CONFIG_SYS_MEMTEST_START=0x80000000 @@ -25,6 +24,7 @@ CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile imx6ull-colibri${variant}-$ CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_SYS_PROMPT="Colibri iMX6ULL # " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=547 # CONFIG_BOOTM_PLAN9 is not set diff --git a/configs/colibri-imx8x_defconfig b/configs/colibri-imx8x_defconfig index c7ddb7d..2c3086a 100644 --- a/configs/colibri-imx8x_defconfig +++ b/configs/colibri-imx8x_defconfig @@ -13,7 +13,6 @@ CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-colibri" CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000 CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000 CONFIG_TARGET_COLIBRI_IMX8X=y -CONFIG_SYS_PROMPT="Colibri iMX8X # " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_LOAD_ADDR=0x95c00000 CONFIG_SYS_MEMTEST_START=0x88000000 @@ -30,6 +29,7 @@ CONFIG_LOG=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_SYS_PROMPT="Colibri iMX8X # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2068 diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig index be1037b..de5633c 100644 --- a/configs/colibri_imx6_defconfig +++ b/configs/colibri_imx6_defconfig @@ -17,7 +17,6 @@ CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx6dl-colibri-eval-v3" CONFIG_SPL_TEXT_BASE=0x00908000 -CONFIG_SYS_PROMPT="Colibri iMX6 # " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y @@ -42,6 +41,7 @@ CONFIG_MISC_INIT_R=y CONFIG_SYS_SPL_MALLOC=y CONFIG_SPL_DMA=y CONFIG_SPL_I2C=y +CONFIG_SYS_PROMPT="Colibri iMX6 # " CONFIG_SYS_MAXARGS=48 CONFIG_SYS_CBSIZE=1024 CONFIG_SYS_PBSIZE=1056 diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig index 2716a98..eba2b41 100644 --- a/configs/colibri_imx7_defconfig +++ b/configs/colibri_imx7_defconfig @@ -7,7 +7,6 @@ CONFIG_ENV_OFFSET=0x380000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx7d-colibri-eval-v3" CONFIG_TARGET_COLIBRI_IMX7=y -CONFIG_SYS_PROMPT="Colibri iMX7 # " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_IMX_RDC=y CONFIG_IMX_BOOTAUX=y @@ -27,6 +26,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOARD_LATE_INIT=y +CONFIG_SYS_PROMPT="Colibri iMX7 # " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=544 # CONFIG_BOOTM_PLAN9 is not set diff --git a/configs/colibri_imx7_emmc_defconfig b/configs/colibri_imx7_emmc_defconfig index dbc1e33..49a51e9 100644 --- a/configs/colibri_imx7_emmc_defconfig +++ b/configs/colibri_imx7_emmc_defconfig @@ -7,7 +7,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx7d-colibri-emmc-eval-v3" CONFIG_TARGET_COLIBRI_IMX7=y CONFIG_TARGET_COLIBRI_IMX7_EMMC=y -CONFIG_SYS_PROMPT="Colibri iMX7 # " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_ARMV7_BOOT_SEC_DEFAULT=y CONFIG_IMX_RDC=y @@ -26,6 +25,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOARD_LATE_INIT=y +CONFIG_SYS_PROMPT="Colibri iMX7 # " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=544 # CONFIG_BOOTM_PLAN9 is not set diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig index eb2e202..28a77d1 100644 --- a/configs/colibri_t20_defconfig +++ b/configs/colibri_t20_defconfig @@ -8,7 +8,6 @@ CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0x200000 CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri" CONFIG_SPL_TEXT_BASE=0x00108000 -CONFIG_SYS_PROMPT="Colibri T20 # " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SPL_STACK=0xffffc CONFIG_TEGRA20=y @@ -26,6 +25,7 @@ CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x90000 CONFIG_SYS_SPL_MALLOC_SIZE=0x10000 +CONFIG_SYS_PROMPT="Colibri T20 # " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_CBSIZE=1024 CONFIG_SYS_PBSIZE=1055 diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig index 8098ff7..88dc245 100644 --- a/configs/colibri_t30_defconfig +++ b/configs/colibri_t30_defconfig @@ -8,7 +8,6 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFFDE00 CONFIG_DEFAULT_DEVICE_TREE="tegra30-colibri" CONFIG_SPL_TEXT_BASE=0x80108000 -CONFIG_SYS_PROMPT="Colibri T30 # " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SPL_STACK=0x800ffffc CONFIG_TEGRA30=y @@ -27,6 +26,7 @@ CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x80090000 CONFIG_SYS_SPL_MALLOC_SIZE=0x10000 +CONFIG_SYS_PROMPT="Colibri T30 # " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_CBSIZE=1024 CONFIG_SYS_PBSIZE=1055 diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig index 4d4d0e4..1d34a46 100644 --- a/configs/colibri_vf_defconfig +++ b/configs/colibri_vf_defconfig @@ -9,7 +9,6 @@ CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0x180000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="vf610-colibri-eval-v3" -CONFIG_SYS_PROMPT="Colibri VFxx # " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_TARGET_COLIBRI_VF=y CONFIG_SYS_LOAD_ADDR=0x80008000 @@ -30,6 +29,7 @@ CONFIG_ARCH_MISC_INIT=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y # CONFIG_SYS_LONGHELP is not set +CONFIG_SYS_PROMPT="Colibri VFxx # " CONFIG_SYS_PBSIZE=1056 # CONFIG_CMD_BOOTD is not set # CONFIG_CMD_BOOTM is not set diff --git a/configs/comtrend_ar5315u_ram_defconfig b/configs/comtrend_ar5315u_ram_defconfig index 01f7e70..76f2f67 100644 --- a/configs/comtrend_ar5315u_ram_defconfig +++ b/configs/comtrend_ar5315u_ram_defconfig @@ -5,7 +5,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="comtrend,ar-5315u" -CONFIG_SYS_PROMPT="AR-5315un # " CONFIG_DM_RESET=y CONFIG_SYS_LOAD_ADDR=0x80100000 CONFIG_ARCH_BMIPS=y @@ -22,6 +21,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DISPLAY_CPUINFO=y CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="AR-5315un # " CONFIG_SYS_MAXARGS=24 CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=541 diff --git a/configs/comtrend_ar5387un_ram_defconfig b/configs/comtrend_ar5387un_ram_defconfig index 1d8e0d7..fdbb23e 100644 --- a/configs/comtrend_ar5387un_ram_defconfig +++ b/configs/comtrend_ar5387un_ram_defconfig @@ -5,7 +5,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="comtrend,ar-5387un" -CONFIG_SYS_PROMPT="AR-5387un # " CONFIG_DM_RESET=y CONFIG_SYS_LOAD_ADDR=0x80100000 CONFIG_ARCH_BMIPS=y @@ -22,6 +21,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DISPLAY_CPUINFO=y CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="AR-5387un # " CONFIG_SYS_MAXARGS=24 CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=541 diff --git a/configs/comtrend_ct5361_ram_defconfig b/configs/comtrend_ct5361_ram_defconfig index c649104..e0fdf31 100644 --- a/configs/comtrend_ct5361_ram_defconfig +++ b/configs/comtrend_ct5361_ram_defconfig @@ -5,7 +5,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="comtrend,ct-5361" -CONFIG_SYS_PROMPT="CT-5361 # " CONFIG_DM_RESET=y CONFIG_SYS_LOAD_ADDR=0x80100000 CONFIG_ARCH_BMIPS=y @@ -22,6 +21,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DISPLAY_CPUINFO=y CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="CT-5361 # " CONFIG_SYS_MAXARGS=24 CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=539 diff --git a/configs/comtrend_vr3032u_ram_defconfig b/configs/comtrend_vr3032u_ram_defconfig index 8bdb959..c967490 100644 --- a/configs/comtrend_vr3032u_ram_defconfig +++ b/configs/comtrend_vr3032u_ram_defconfig @@ -5,7 +5,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="comtrend,vr-3032u" -CONFIG_SYS_PROMPT="VR-3032u # " CONFIG_DM_RESET=y CONFIG_SYS_LOAD_ADDR=0x80100000 CONFIG_ARCH_BMIPS=y @@ -22,6 +21,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DISPLAY_CPUINFO=y CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="VR-3032u # " CONFIG_SYS_MAXARGS=24 CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=540 diff --git a/configs/comtrend_wap5813n_ram_defconfig b/configs/comtrend_wap5813n_ram_defconfig index d262249..5c86c80 100644 --- a/configs/comtrend_wap5813n_ram_defconfig +++ b/configs/comtrend_wap5813n_ram_defconfig @@ -5,7 +5,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="comtrend,wap-5813n" -CONFIG_SYS_PROMPT="WAP-5813n # " CONFIG_DM_RESET=y CONFIG_SYS_LOAD_ADDR=0x80100000 CONFIG_ARCH_BMIPS=y @@ -22,6 +21,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DISPLAY_CPUINFO=y CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="WAP-5813n # " CONFIG_SYS_MAXARGS=24 CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=541 diff --git a/configs/corstone1000_defconfig b/configs/corstone1000_defconfig index 3b5733b..074936d 100644 --- a/configs/corstone1000_defconfig +++ b/configs/corstone1000_defconfig @@ -7,7 +7,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x83f00000 CONFIG_DEFAULT_DEVICE_TREE="corstone1000-mps3" -CONFIG_SYS_PROMPT="corstone1000# " CONFIG_IDENT_STRING=" corstone1000 aarch64 " CONFIG_SYS_LOAD_ADDR=0x82100000 CONFIG_FIT=y @@ -21,6 +20,7 @@ CONFIG_LOGLEVEL=7 # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_LATE_INIT=y +CONFIG_SYS_PROMPT="corstone1000# " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=512 # CONFIG_CMD_CONSOLE is not set diff --git a/configs/cortina_presidio-asic-base_defconfig b/configs/cortina_presidio-asic-base_defconfig index 9f88511..ce967ce 100644 --- a/configs/cortina_presidio-asic-base_defconfig +++ b/configs/cortina_presidio-asic-base_defconfig @@ -11,7 +11,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x100000 CONFIG_ENV_SIZE=0x20000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="ca-presidio-engboard" -CONFIG_SYS_PROMPT="G3#" CONFIG_IDENT_STRING="Presidio-SoC" CONFIG_SYS_LOAD_ADDR=0x10000000 CONFIG_REMAKE_ELF=y @@ -22,6 +21,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="earlycon=serial,0xf4329148 console=ttyS0,115200 root=/dev/ram0" CONFIG_BOARD_EARLY_INIT_R=y CONFIG_LAST_STAGE_INIT=y +CONFIG_SYS_PROMPT="G3#" CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=276 diff --git a/configs/cortina_presidio-asic-emmc_defconfig b/configs/cortina_presidio-asic-emmc_defconfig index 24caa84..3f73020 100644 --- a/configs/cortina_presidio-asic-emmc_defconfig +++ b/configs/cortina_presidio-asic-emmc_defconfig @@ -11,7 +11,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x100000 CONFIG_ENV_SIZE=0x20000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="ca-presidio-engboard" -CONFIG_SYS_PROMPT="G3#" CONFIG_IDENT_STRING="Presidio-SoC" CONFIG_SYS_LOAD_ADDR=0x10000000 CONFIG_REMAKE_ELF=y @@ -20,6 +19,7 @@ CONFIG_SHOW_BOOT_PROGRESS=y CONFIG_BOOTDELAY=3 CONFIG_BOARD_EARLY_INIT_R=y CONFIG_LAST_STAGE_INIT=y +CONFIG_SYS_PROMPT="G3#" CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=276 diff --git a/configs/cortina_presidio-asic-pnand_defconfig b/configs/cortina_presidio-asic-pnand_defconfig index 637809d..af39a84 100644 --- a/configs/cortina_presidio-asic-pnand_defconfig +++ b/configs/cortina_presidio-asic-pnand_defconfig @@ -11,7 +11,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x100000 CONFIG_ENV_SIZE=0x20000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="ca-presidio-engboard" -CONFIG_SYS_PROMPT="G3#" CONFIG_IDENT_STRING="Presidio-SoC" CONFIG_SYS_LOAD_ADDR=0x10000000 CONFIG_REMAKE_ELF=y @@ -22,6 +21,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="earlycon=serial,0xf4329148 console=ttyS0,115200 root=/dev/ram0" CONFIG_BOARD_EARLY_INIT_R=y CONFIG_LAST_STAGE_INIT=y +CONFIG_SYS_PROMPT="G3#" CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=276 diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig index 363158e..ecf61f0 100644 --- a/configs/corvus_defconfig +++ b/configs/corvus_defconfig @@ -20,7 +20,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x70007f00 CONFIG_ENV_OFFSET=0x100000 CONFIG_DEFAULT_DEVICE_TREE="at91sam9g45-corvus" CONFIG_SPL_TEXT_BASE=0x300000 -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SPL_SERIAL=y CONFIG_SPL_STACK=0x4000 CONFIG_SPL=y @@ -48,6 +47,7 @@ CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SOFTECC=y CONFIG_SPL_NAND_BASE=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/cubieboard7_defconfig b/configs/cubieboard7_defconfig index 0a903c7..6654ae2 100644 --- a/configs/cubieboard7_defconfig +++ b/configs/cubieboard7_defconfig @@ -5,7 +5,6 @@ CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x1107ff00 CONFIG_DEFAULT_DEVICE_TREE="s700-cubieboard7" -CONFIG_SYS_PROMPT="U-Boot => " CONFIG_MACH_S700=y CONFIG_IDENT_STRING="\ncubieboard7" CONFIG_SYS_LOAD_ADDR=0x7ffc0 @@ -15,6 +14,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyOWL3,115200n8" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_PROMPT="U-Boot => " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=1051 CONFIG_SYS_BOOTM_LEN=0x800000 diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig index b70762c..0f2b1b8 100644 --- a/configs/d2net_v2_defconfig +++ b/configs/d2net_v2_defconfig @@ -12,7 +12,6 @@ CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x70000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-d2net" -CONFIG_SYS_PROMPT="d2v2> " CONFIG_IDENT_STRING=" D2 v2" CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_ENV_ADDR=0x70000 @@ -28,6 +27,7 @@ CONFIG_CONSOLE_MUX=y CONFIG_MISC_INIT_R=y CONFIG_RESET_PHY_R=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="d2v2> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=1047 CONFIG_CMD_EEPROM=y diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig index 2001327..7d87588 100644 --- a/configs/da850evm_defconfig +++ b/configs/da850evm_defconfig @@ -20,7 +20,6 @@ CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="da850-evm" CONFIG_SPL_TEXT_BASE=0x80000000 -CONFIG_SYS_PROMPT="U-Boot > " CONFIG_SPL_SERIAL=y CONFIG_SPL_STACK=0x8001ff00 CONFIG_SPL=y @@ -55,6 +54,7 @@ CONFIG_SPL_DM_SPI_FLASH=y CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x8000 CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot > " CONFIG_SYS_PBSIZE=1050 CONFIG_CRC32_VERIFY=y CONFIG_CMD_MX_CYCLIC=y diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig index 7c4a174..2de4484 100644 --- a/configs/da850evm_direct_nor_defconfig +++ b/configs/da850evm_direct_nor_defconfig @@ -15,7 +15,6 @@ CONFIG_ENV_SIZE=0x2800 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="da850-evm" -CONFIG_SYS_PROMPT="U-Boot > " CONFIG_SYS_LOAD_ADDR=0xc0700000 CONFIG_ENV_ADDR=0x60100000 CONFIG_LTO=y @@ -32,6 +31,7 @@ CONFIG_CLOCKS=y CONFIG_HWCONFIG=y CONFIG_MISC_INIT_R=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot > " CONFIG_SYS_PBSIZE=1050 # CONFIG_CMD_BOOTZ is not set CONFIG_CMD_IMLS=y diff --git a/configs/da850evm_nand_defconfig b/configs/da850evm_nand_defconfig index eddaa49..0ccd1b4 100644 --- a/configs/da850evm_nand_defconfig +++ b/configs/da850evm_nand_defconfig @@ -17,7 +17,6 @@ CONFIG_ENV_OFFSET=0x0 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="da850-evm" CONFIG_SPL_TEXT_BASE=0x80000000 -CONFIG_SYS_PROMPT="U-Boot > " CONFIG_SPL_SERIAL=y CONFIG_SPL_STACK=0x8001ff00 CONFIG_SPL=y @@ -53,6 +52,7 @@ CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_SPL_NAND_BASE=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot > " CONFIG_SYS_PBSIZE=1050 CONFIG_CRC32_VERIFY=y CONFIG_CMD_MX_CYCLIC=y diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig index 92f4436..442827d 100644 --- a/configs/dalmore_defconfig +++ b/configs/dalmore_defconfig @@ -9,7 +9,6 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFFE000 CONFIG_DEFAULT_DEVICE_TREE="tegra114-dalmore" CONFIG_SPL_TEXT_BASE=0x80108000 -CONFIG_SYS_PROMPT="Tegra114 (Dalmore) # " CONFIG_SPL_STACK=0x800ffffc CONFIG_TEGRA114=y CONFIG_TARGET_DALMORE=y @@ -25,6 +24,7 @@ CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x80090000 CONFIG_SYS_SPL_MALLOC_SIZE=0x10000 +CONFIG_SYS_PROMPT="Tegra114 (Dalmore) # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2086 # CONFIG_CMD_IMI is not set diff --git a/configs/deneb_defconfig b/configs/deneb_defconfig index 0d714bd..3e2675f 100644 --- a/configs/deneb_defconfig +++ b/configs/deneb_defconfig @@ -15,7 +15,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8-deneb" CONFIG_SPL_TEXT_BASE=0x100000 CONFIG_TARGET_DENEB=y -CONFIG_SYS_PROMPT="U-Boot# " CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y @@ -56,6 +55,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x800 CONFIG_SPL_POWER_DOMAIN=y CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot# " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2073 diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig index c1094b4..5ea9e0b 100644 --- a/configs/dh_imx6_defconfig +++ b/configs/dh_imx6_defconfig @@ -37,7 +37,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_SPL_FIT=y CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=3 -# CONFIG_USE_BOOTCOMMAND is not set CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y CONFIG_SYS_SPL_MALLOC=y CONFIG_SPL_SPI_LOAD=y diff --git a/configs/display5_defconfig b/configs/display5_defconfig index 551e2a9..481c737 100644 --- a/configs/display5_defconfig +++ b/configs/display5_defconfig @@ -19,7 +19,6 @@ CONFIG_SYS_I2C_MXC_I2C2=y CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-display5" CONFIG_SPL_TEXT_BASE=0x00908000 -CONFIG_SYS_PROMPT="display5 > " CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -54,6 +53,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x10 CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000 CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="display5 > " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2076 diff --git a/configs/display5_factory_defconfig b/configs/display5_factory_defconfig index a5396f7..e480499 100644 --- a/configs/display5_factory_defconfig +++ b/configs/display5_factory_defconfig @@ -19,7 +19,6 @@ CONFIG_SYS_I2C_MXC_I2C2=y CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-display5" CONFIG_SPL_TEXT_BASE=0x00908000 -CONFIG_SYS_PROMPT="display5 factory > " CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -49,6 +48,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x10 CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000 CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="display5 factory > " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2084 diff --git a/configs/dockstar_defconfig b/configs/dockstar_defconfig index 1829708..59c4345 100644 --- a/configs/dockstar_defconfig +++ b/configs/dockstar_defconfig @@ -14,7 +14,6 @@ CONFIG_TARGET_DOCKSTAR=y CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0x80000 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-dockstar" -CONFIG_SYS_PROMPT="DockStar> " CONFIG_IDENT_STRING="\nSeagate FreeAgent DockStar" CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_BOOTDELAY=3 @@ -23,6 +22,7 @@ CONFIG_BOOTCOMMAND="setenv bootargs ${console} ${mtdparts} ${bootargs_root}; ubi CONFIG_USE_PREBOOT=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="DockStar> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=1051 # CONFIG_CMD_FLASH is not set diff --git a/configs/draco_defconfig b/configs/draco_defconfig index b71b23f..981a364 100644 --- a/configs/draco_defconfig +++ b/configs/draco_defconfig @@ -13,7 +13,6 @@ CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="am335x-draco" CONFIG_AM33XX=y CONFIG_SYS_MPUCLK=300 -CONFIG_SYS_PROMPT="U-Boot# " CONFIG_TARGET_DRACO=y CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -52,6 +51,7 @@ CONFIG_SPL_WATCHDOG=y CONFIG_SPL_YMODEM_SUPPORT=y # CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC is not set CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot# " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=1049 CONFIG_CMD_ASKENV=y diff --git a/configs/dragonboard410c_defconfig b/configs/dragonboard410c_defconfig index 84b0834..32d761c 100644 --- a/configs/dragonboard410c_defconfig +++ b/configs/dragonboard410c_defconfig @@ -9,7 +9,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x8007fff0 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x0 CONFIG_DEFAULT_DEVICE_TREE="dragonboard410c" -CONFIG_SYS_PROMPT="dragonboard410c => " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_IDENT_STRING="\nQualcomm-DragonBoard 410C" CONFIG_SYS_LOAD_ADDR=0x80080000 @@ -22,6 +21,7 @@ CONFIG_USE_PREBOOT=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_MISC_INIT_R=y +CONFIG_SYS_PROMPT="dragonboard410c => " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=548 diff --git a/configs/dragonboard820c_defconfig b/configs/dragonboard820c_defconfig index 89b4752..15d12bb 100644 --- a/configs/dragonboard820c_defconfig +++ b/configs/dragonboard820c_defconfig @@ -8,7 +8,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x8007fff0 CONFIG_ENV_SIZE=0x4000 CONFIG_DEFAULT_DEVICE_TREE="dragonboard820c" -CONFIG_SYS_PROMPT="dragonboard820c => " CONFIG_TARGET_DRAGONBOARD820C=y CONFIG_IDENT_STRING="\nQualcomm-DragonBoard 820C" CONFIG_SYS_LOAD_ADDR=0x80080000 @@ -19,6 +18,7 @@ CONFIG_BOOTARGS="console=ttyMSM0,115200n8" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_MISC_INIT_R=y +CONFIG_SYS_PROMPT="dragonboard820c => " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=548 diff --git a/configs/ds116_defconfig b/configs/ds116_defconfig index dc7ce22..0cd546c 100644 --- a/configs/ds116_defconfig +++ b/configs/ds116_defconfig @@ -18,7 +18,6 @@ CONFIG_ENV_OFFSET=0x7E0000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DEFAULT_DEVICE_TREE="armada-385-synology-ds116" CONFIG_SPL_TEXT_BASE=0x40000030 -CONFIG_SYS_PROMPT="DS116> " CONFIG_SPL_SERIAL=y CONFIG_SPL_STACK=0x4002c000 CONFIG_SPL=y @@ -42,6 +41,7 @@ CONFIG_SPL_BSS_MAX_SIZE=0x4000 CONFIG_SPL_SYS_MALLOC_SIMPLE=y # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set CONFIG_SPL_I2C=y +CONFIG_SYS_PROMPT="DS116> " CONFIG_SYS_MAXARGS=32 CONFIG_CMD_GPIO=y CONFIG_CMD_GPIO_READ=y diff --git a/configs/durian_defconfig b/configs/durian_defconfig index a5756c1..1a32139 100644 --- a/configs/durian_defconfig +++ b/configs/durian_defconfig @@ -9,7 +9,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x87f00000 CONFIG_ENV_SIZE=0x1000 CONFIG_DEFAULT_DEVICE_TREE="phytium-durian" -CONFIG_SYS_PROMPT="durian#" # CONFIG_PSCI_RESET is not set CONFIG_SYS_LOAD_ADDR=0x90000000 CONFIG_SYS_PCI_64BIT=y @@ -21,6 +20,7 @@ CONFIG_BOOTARGS="console=ttyAMA0,115200 earlycon=pl011,0x28001000 root=/dev/sda2 # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_LAST_STAGE_INIT=y +CONFIG_SYS_PROMPT="durian#" CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=280 CONFIG_SYS_BOOTM_LEN=0x3c00000 diff --git a/configs/eDPU_defconfig b/configs/eDPU_defconfig index 77ea2b2..f51df78 100644 --- a/configs/eDPU_defconfig +++ b/configs/eDPU_defconfig @@ -10,7 +10,6 @@ CONFIG_ENV_OFFSET=0x180000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="armada-3720-eDPU" -CONFIG_SYS_PROMPT="eDPU>> " CONFIG_DEBUG_UART_BASE=0xd0012000 CONFIG_SYS_LOAD_ADDR=0x6000000 CONFIG_DEBUG_UART=y @@ -23,6 +22,7 @@ CONFIG_USE_PREBOOT=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_SYS_PROMPT="eDPU>> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=1048 # CONFIG_CMD_ELF is not set diff --git a/configs/ea-lpc3250devkitv2_defconfig b/configs/ea-lpc3250devkitv2_defconfig index 2b1b032..216806d 100644 --- a/configs/ea-lpc3250devkitv2_defconfig +++ b/configs/ea-lpc3250devkitv2_defconfig @@ -11,7 +11,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80000f20 CONFIG_TARGET_EA_LPC3250DEVKITV2=y CONFIG_DEFAULT_DEVICE_TREE="lpc3250-ea3250" -CONFIG_SYS_PROMPT="EA-LPC3250v2=> " CONFIG_SYS_LOAD_ADDR=0x80100000 CONFIG_HAS_BOARD_SIZE_LIMIT=y CONFIG_BOARD_SIZE_LIMIT=1048575 @@ -20,6 +19,7 @@ CONFIG_DISTRO_DEFAULTS=y # CONFIG_AUTOBOOT is not set # CONFIG_USE_BOOTCOMMAND is not set CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_SYS_PROMPT="EA-LPC3250v2=> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=288 CONFIG_CMD_GPIO=y diff --git a/configs/eb_cpu5282_defconfig b/configs/eb_cpu5282_defconfig index 2873322..1aa17c9 100644 --- a/configs/eb_cpu5282_defconfig +++ b/configs/eb_cpu5282_defconfig @@ -3,7 +3,6 @@ CONFIG_TEXT_BASE=0xFF000000 CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="eb_cpu5282" -CONFIG_SYS_PROMPT="\nEB+CPU5282> " CONFIG_SYS_MONITOR_LEN=131072 CONFIG_SYS_LOAD_ADDR=0x20000 CONFIG_ENV_ADDR=0xFF040000 @@ -20,6 +19,7 @@ CONFIG_BOOTCOMMAND="printenv" CONFIG_MISC_INIT_R=y CONFIG_SYS_MALLOC_BOOTPARAMS=y # CONFIG_AUTO_COMPLETE is not set +CONFIG_SYS_PROMPT="\nEB+CPU5282> " CONFIG_SYS_CBSIZE=1024 CONFIG_SYS_PBSIZE=1054 CONFIG_CMD_IMLS=y diff --git a/configs/emsdp_defconfig b/configs/emsdp_defconfig index 86cc59a..12ebc76 100644 --- a/configs/emsdp_defconfig +++ b/configs/emsdp_defconfig @@ -9,12 +9,12 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x10100000 CONFIG_ENV_SIZE=0x1000 CONFIG_DEFAULT_DEVICE_TREE="emsdp" -CONFIG_SYS_PROMPT="emsdp# " CONFIG_SYS_CLK_FREQ=40000000 CONFIG_SYS_LOAD_ADDR=0x10000000 # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set CONFIG_BOARD_EARLY_INIT_R=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="emsdp# " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=280 # CONFIG_CMD_BOOTD is not set diff --git a/configs/endeavoru_defconfig b/configs/endeavoru_defconfig index 38f26f2..681aae2 100644 --- a/configs/endeavoru_defconfig +++ b/configs/endeavoru_defconfig @@ -10,7 +10,6 @@ CONFIG_ENV_SIZE=0x3000 CONFIG_ENV_OFFSET=0xFFFFD000 CONFIG_DEFAULT_DEVICE_TREE="tegra30-htc-endeavoru" CONFIG_SPL_TEXT_BASE=0x80108000 -CONFIG_SYS_PROMPT="Tegra30 (Endeavoru) # " CONFIG_SPL_STACK=0x800ffffc CONFIG_TEGRA30=y CONFIG_TARGET_ENDEAVORU=y @@ -21,7 +20,6 @@ CONFIG_OF_SYSTEM_SETUP=y CONFIG_BOOTDELAY=0 CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_KEYED_CTRLC=y -CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="if run check_button; then bootmenu; fi; run bootcmd_mmc0; poweroff;" CONFIG_SPL_FOOTPRINT_LIMIT=y CONFIG_SPL_MAX_FOOTPRINT=0x8000 @@ -30,6 +28,7 @@ CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x80090000 CONFIG_SYS_SPL_MALLOC_SIZE=0x10000 +CONFIG_SYS_PROMPT="Tegra30 (Endeavoru) # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2084 CONFIG_CMD_BOOTMENU=y @@ -44,7 +43,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_CMD_UMS_ABORT_KEYED=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_PAUSE=y CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_DOS_PARTITION is not set diff --git a/configs/espresso7420_defconfig b/configs/espresso7420_defconfig index 80329d9..cb7c94a 100644 --- a/configs/espresso7420_defconfig +++ b/configs/espresso7420_defconfig @@ -9,7 +9,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x2158000 CONFIG_ENV_SIZE=0x4000 CONFIG_DEFAULT_DEVICE_TREE="exynos7420-espresso7420" -CONFIG_SYS_PROMPT="ESPRESSO7420 # " CONFIG_IDENT_STRING=" for ESPRESSO7420" CONFIG_SYS_LOAD_ADDR=0x43e00000 # CONFIG_AUTOBOOT is not set @@ -19,6 +18,7 @@ CONFIG_CONSOLE_MUX=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set # CONFIG_SYS_LONGHELP is not set +CONFIG_SYS_PROMPT="ESPRESSO7420 # " CONFIG_SYS_PBSIZE=1024 CONFIG_SYS_BOOTM_LEN=0x800000 # CONFIG_CMD_SETEXPR is not set diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig index 43cfed9..870d8d2 100644 --- a/configs/etamin_defconfig +++ b/configs/etamin_defconfig @@ -14,7 +14,6 @@ CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="am335x-draco" CONFIG_AM33XX=y CONFIG_SYS_MPUCLK=300 -CONFIG_SYS_PROMPT="U-Boot# " CONFIG_TARGET_ETAMIN=y CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -53,6 +52,7 @@ CONFIG_SPL_WATCHDOG=y CONFIG_SPL_YMODEM_SUPPORT=y # CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC is not set CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot# " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=1049 CONFIG_CMD_ASKENV=y diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig index f03b59e..666f103 100644 --- a/configs/ethernut5_defconfig +++ b/configs/ethernut5_defconfig @@ -13,7 +13,6 @@ CONFIG_ENV_OFFSET=0x3DE000 CONFIG_ENV_SECT_SIZE=0x21000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="ethernut5" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_LOAD_ADDR=0x020000000 CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y @@ -23,6 +22,7 @@ CONFIG_BOOTCOMMAND="sf probe 0:0; sf read 0x22000000 0xc6000 0x294000; bootm 0x2 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y # CONFIG_AUTO_COMPLETE is not set +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/giedi_defconfig b/configs/giedi_defconfig index 75d5d89..57b0645 100644 --- a/configs/giedi_defconfig +++ b/configs/giedi_defconfig @@ -15,7 +15,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8-giedi" CONFIG_SPL_TEXT_BASE=0x100000 CONFIG_TARGET_GIEDI=y -CONFIG_SYS_PROMPT="U-Boot# " CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y @@ -56,6 +55,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x800 CONFIG_SPL_POWER_DOMAIN=y CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot# " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2073 diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig index ef74086..5c3b81c 100644 --- a/configs/goflexhome_defconfig +++ b/configs/goflexhome_defconfig @@ -14,7 +14,6 @@ CONFIG_TARGET_GOFLEXHOME=y CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0xC0000 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-goflexnet" -CONFIG_SYS_PROMPT="GoFlexHome> " CONFIG_IDENT_STRING="\nSeagate GoFlex Home" CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_BOOTDELAY=3 @@ -23,6 +22,7 @@ CONFIG_BOOTCOMMAND="setenv bootargs ${console} ${mtdparts} ${bootargs_root}; ubi CONFIG_USE_PREBOOT=y CONFIG_CONSOLE_MUX=y # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_PROMPT="GoFlexHome> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=1053 # CONFIG_CMD_FLASH is not set diff --git a/configs/grouper_common_defconfig b/configs/grouper_common_defconfig index 8dc8885..45485d6 100644 --- a/configs/grouper_common_defconfig +++ b/configs/grouper_common_defconfig @@ -10,7 +10,6 @@ CONFIG_ENV_SIZE=0x3000 CONFIG_ENV_OFFSET=0xFFFFD000 CONFIG_DEFAULT_DEVICE_TREE="tegra30-asus-nexus7-grouper-E1565" CONFIG_SPL_TEXT_BASE=0x80108000 -CONFIG_SYS_PROMPT="Tegra30 (Grouper) # " CONFIG_SPL_STACK=0x800ffffc CONFIG_TEGRA30=y CONFIG_TARGET_GROUPER=y @@ -21,7 +20,6 @@ CONFIG_OF_SYSTEM_SETUP=y CONFIG_BOOTDELAY=0 CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_KEYED_CTRLC=y -CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="if run check_button; then bootmenu; fi; run bootcmd_mmc0; poweroff;" CONFIG_SPL_FOOTPRINT_LIMIT=y CONFIG_SPL_MAX_FOOTPRINT=0x8000 @@ -30,6 +28,7 @@ CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x80090000 CONFIG_SYS_SPL_MALLOC_SIZE=0x10000 +CONFIG_SYS_PROMPT="Tegra30 (Grouper) # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2084 CONFIG_CMD_BOOTMENU=y @@ -43,7 +42,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_CMD_UMS_ABORT_KEYED=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_PAUSE=y CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_DOS_PARTITION is not set diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig index 3c558ba..fd2489d 100644 --- a/configs/gwventana_emmc_defconfig +++ b/configs/gwventana_emmc_defconfig @@ -16,7 +16,6 @@ CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_CMD_EECONFIG=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-gw54xx" CONFIG_SPL_TEXT_BASE=0x00908000 -CONFIG_SYS_PROMPT="Ventana > " CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -56,6 +55,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x800 CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x100 CONFIG_SPL_POWER=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="Ventana > " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=539 CONFIG_CMD_BOOTZ=y diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig index a41a892..eaab1d8 100644 --- a/configs/gwventana_nand_defconfig +++ b/configs/gwventana_nand_defconfig @@ -16,7 +16,6 @@ CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_CMD_EECONFIG=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-gw54xx" CONFIG_SPL_TEXT_BASE=0x00908000 -CONFIG_SYS_PROMPT="Ventana > " CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -58,6 +57,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x800 CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x100 CONFIG_SPL_POWER=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="Ventana > " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=539 CONFIG_CMD_BOOTZ=y diff --git a/configs/gxp_defconfig b/configs/gxp_defconfig index 549bef7..8a18c29 100644 --- a/configs/gxp_defconfig +++ b/configs/gxp_defconfig @@ -12,7 +12,6 @@ CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0x60000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DEFAULT_DEVICE_TREE="hpe-bmc-dl360gen10" -CONFIG_SYS_PROMPT="gxp# " CONFIG_ENV_OFFSET_REDUND=0x70000 CONFIG_SYS_LOAD_ADDR=0x40100000 CONFIG_FIT=y @@ -29,6 +28,7 @@ CONFIG_BOOTCOMMAND="run spiboot" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="gxp# " # CONFIG_BOOTM_NETBSD is not set # CONFIG_BOOTM_PLAN9 is not set # CONFIG_BOOTM_RTEMS is not set diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig index 8b49505..6558a67 100644 --- a/configs/harmony_defconfig +++ b/configs/harmony_defconfig @@ -7,7 +7,6 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x1FFE0000 CONFIG_DEFAULT_DEVICE_TREE="tegra20-harmony" CONFIG_SPL_TEXT_BASE=0x00108000 -CONFIG_SYS_PROMPT="Tegra20 (Harmony) # " CONFIG_SPL_STACK=0xffffc CONFIG_TEGRA20=y CONFIG_TARGET_HARMONY=y @@ -23,6 +22,7 @@ CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x90000 CONFIG_SYS_SPL_MALLOC_SIZE=0x10000 +CONFIG_SYS_PROMPT="Tegra20 (Harmony) # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2085 # CONFIG_CMD_IMI is not set diff --git a/configs/hc2910_2aghd05_defconfig b/configs/hc2910_2aghd05_defconfig index dfd3e65..0e7ba7a 100644 --- a/configs/hc2910_2aghd05_defconfig +++ b/configs/hc2910_2aghd05_defconfig @@ -8,13 +8,13 @@ CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0x1F0000 CONFIG_DEFAULT_DEVICE_TREE="hi3798mv200-hc2910-2aghd05" -CONFIG_SYS_PROMPT="HC2910# " CONFIG_IDENT_STRING="HC2910" CONFIG_SYS_LOAD_ADDR=0x800000 # CONFIG_EXPERT is not set CONFIG_ANDROID_BOOT_IMAGE=y CONFIG_DISTRO_DEFAULTS=y # CONFIG_DISPLAY_CPUINFO is not set +CONFIG_SYS_PROMPT="HC2910# " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=537 diff --git a/configs/hikey960_defconfig b/configs/hikey960_defconfig index 5cf822b..4274e6a 100644 --- a/configs/hikey960_defconfig +++ b/configs/hikey960_defconfig @@ -8,7 +8,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x7fff0 CONFIG_ENV_SIZE=0x1000 CONFIG_DEFAULT_DEVICE_TREE="hi3660-hikey960" -CONFIG_SYS_PROMPT="U-Boot => " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_IDENT_STRING="\nHikey960" CONFIG_SYS_LOAD_ADDR=0x80000 @@ -20,6 +19,7 @@ CONFIG_BOOTARGS="console=ttyAMA6,115200n8 root=/dev/mmcblk0p2 rw" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_MISC_INIT_R=y +CONFIG_SYS_PROMPT="U-Boot => " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=283 CONFIG_CMD_MD5SUM=y diff --git a/configs/hsdk_4xd_defconfig b/configs/hsdk_4xd_defconfig index df8e55f..5caf75f 100644 --- a/configs/hsdk_4xd_defconfig +++ b/configs/hsdk_4xd_defconfig @@ -9,7 +9,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80000f30 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="hsdk-4xd" -CONFIG_SYS_PROMPT="hsdk-4xd# " CONFIG_DM_RESET=y CONFIG_DEBUG_UART_BASE=0xf0005000 CONFIG_DEBUG_UART_CLOCK=33333333 @@ -22,6 +21,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_R=y CONFIG_BOARD_LATE_INIT=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="hsdk-4xd# " CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2075 CONFIG_SYS_BOOTM_LEN=0x8000000 diff --git a/configs/hsdk_defconfig b/configs/hsdk_defconfig index 2037402..5a027f4 100644 --- a/configs/hsdk_defconfig +++ b/configs/hsdk_defconfig @@ -8,7 +8,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80000f30 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="hsdk" -CONFIG_SYS_PROMPT="hsdk# " CONFIG_DM_RESET=y CONFIG_DEBUG_UART_BASE=0xf0005000 CONFIG_DEBUG_UART_CLOCK=33333333 @@ -21,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_R=y CONFIG_BOARD_LATE_INIT=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="hsdk# " CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2071 CONFIG_SYS_BOOTM_LEN=0x8000000 diff --git a/configs/huawei_hg556a_ram_defconfig b/configs/huawei_hg556a_ram_defconfig index ae8baa1..0208ed6 100644 --- a/configs/huawei_hg556a_ram_defconfig +++ b/configs/huawei_hg556a_ram_defconfig @@ -5,7 +5,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="huawei,hg556a" -CONFIG_SYS_PROMPT="HG556a # " CONFIG_DM_RESET=y CONFIG_SYS_LOAD_ADDR=0x80100000 CONFIG_ARCH_BMIPS=y @@ -22,6 +21,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DISPLAY_CPUINFO=y CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="HG556a # " CONFIG_SYS_MAXARGS=24 CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=538 diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig index 310fb75..d58a3df 100644 --- a/configs/ib62x0_defconfig +++ b/configs/ib62x0_defconfig @@ -11,7 +11,6 @@ CONFIG_TARGET_IB62X0=y CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0xE0000 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ib62x0" -CONFIG_SYS_PROMPT="ib62x0 => " CONFIG_IDENT_STRING=" RaidSonic ICY BOX IB-NAS62x0" CONFIG_SYS_LOAD_ADDR=0x800000 # CONFIG_SYS_MALLOC_F is not set @@ -21,6 +20,7 @@ CONFIG_BOOTCOMMAND="setenv bootargs ${console} ${mtdparts} ${bootargs_root}; ubi CONFIG_USE_PREBOOT=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="ib62x0 => " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=1051 CONFIG_CMD_BOOTZ=y diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig index 4f6e55c..69864bd 100644 --- a/configs/iconnect_defconfig +++ b/configs/iconnect_defconfig @@ -14,7 +14,6 @@ CONFIG_TARGET_ICONNECT=y CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0x80000 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-iconnect" -CONFIG_SYS_PROMPT="iConnect> " CONFIG_IDENT_STRING=" Iomega iConnect" CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_PCI=y @@ -25,6 +24,7 @@ CONFIG_USE_PREBOOT=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_LATE_INIT=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="iConnect> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=1051 # CONFIG_CMD_FLASH is not set diff --git a/configs/imgtec_xilfpga_defconfig b/configs/imgtec_xilfpga_defconfig index cc390f5..7842774 100644 --- a/configs/imgtec_xilfpga_defconfig +++ b/configs/imgtec_xilfpga_defconfig @@ -6,7 +6,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x87fff000 CONFIG_ENV_SIZE=0x4000 CONFIG_DEFAULT_DEVICE_TREE="nexys4ddr" -CONFIG_SYS_PROMPT="MIPSfpga # " CONFIG_SYS_LOAD_ADDR=0x80500000 CONFIG_TARGET_XILFPGA=y CONFIG_SYS_MIPS_TIMER_FREQ=50000000 @@ -20,6 +19,7 @@ CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set +CONFIG_SYS_PROMPT="MIPSfpga # " CONFIG_SYS_PBSIZE=1052 # CONFIG_CMD_SAVEENV is not set CONFIG_CMD_MEMINFO=y diff --git a/configs/imx6dl_icore_nand_defconfig b/configs/imx6dl_icore_nand_defconfig index f4adda5..8d53282 100644 --- a/configs/imx6dl_icore_nand_defconfig +++ b/configs/imx6dl_icore_nand_defconfig @@ -12,7 +12,6 @@ CONFIG_MX6QDL=y CONFIG_TARGET_MX6Q_ENGICAM=y CONFIG_DEFAULT_DEVICE_TREE="imx6dl-icore" CONFIG_SPL_TEXT_BASE=0x00908000 -CONFIG_SYS_PROMPT="icorem6qdl> " CONFIG_SPL_SERIAL=y CONFIG_SPL=y # CONFIG_CMD_BMODE is not set @@ -30,6 +29,7 @@ CONFIG_SPL_DMA=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="icorem6qdl> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=541 CONFIG_CMD_MEMTEST=y diff --git a/configs/imx6q_icore_nand_defconfig b/configs/imx6q_icore_nand_defconfig index 3b579ba..59c6d6b 100644 --- a/configs/imx6q_icore_nand_defconfig +++ b/configs/imx6q_icore_nand_defconfig @@ -12,7 +12,6 @@ CONFIG_MX6QDL=y CONFIG_TARGET_MX6Q_ENGICAM=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore" CONFIG_SPL_TEXT_BASE=0x00908000 -CONFIG_SYS_PROMPT="icorem6qdl> " CONFIG_SPL_SERIAL=y CONFIG_SPL=y # CONFIG_CMD_BMODE is not set @@ -31,6 +30,7 @@ CONFIG_SPL_DMA=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="icorem6qdl> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=541 CONFIG_CMD_MEMTEST=y diff --git a/configs/imx6q_logic_defconfig b/configs/imx6q_logic_defconfig index 74733c4..0c07b98 100644 --- a/configs/imx6q_logic_defconfig +++ b/configs/imx6q_logic_defconfig @@ -13,7 +13,6 @@ CONFIG_MX6_OCRAM_256KB=y CONFIG_TARGET_MX6LOGICPD=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-logicpd" CONFIG_SPL_TEXT_BASE=0x00908000 -CONFIG_SYS_PROMPT="i.MX6 Logic # " CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -43,6 +42,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000 CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x800 CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x800 CONFIG_SPL_WATCHDOG=y +CONFIG_SYS_PROMPT="i.MX6 Logic # " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=543 CONFIG_CMD_SPL=y diff --git a/configs/imx6qdl_icore_mipi_defconfig b/configs/imx6qdl_icore_mipi_defconfig index 4fdd891..c170638 100644 --- a/configs/imx6qdl_icore_mipi_defconfig +++ b/configs/imx6qdl_icore_mipi_defconfig @@ -12,7 +12,6 @@ CONFIG_MX6QDL=y CONFIG_TARGET_MX6Q_ENGICAM=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore-mipi" CONFIG_SPL_TEXT_BASE=0x00908000 -CONFIG_SYS_PROMPT="icorem6qdl-mipi> " CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -43,6 +42,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x800 CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x10 CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="icorem6qdl-mipi> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=546 CONFIG_CMD_SPL=y diff --git a/configs/imx6qdl_icore_mmc_defconfig b/configs/imx6qdl_icore_mmc_defconfig index 319e808..90d01f2 100644 --- a/configs/imx6qdl_icore_mmc_defconfig +++ b/configs/imx6qdl_icore_mmc_defconfig @@ -12,7 +12,6 @@ CONFIG_MX6QDL=y CONFIG_TARGET_MX6Q_ENGICAM=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore" CONFIG_SPL_TEXT_BASE=0x00908000 -CONFIG_SYS_PROMPT="icorem6qdl> " CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -46,6 +45,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x800 CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x10 CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="icorem6qdl> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=541 CONFIG_CMD_SPL=y diff --git a/configs/imx6qdl_icore_nand_defconfig b/configs/imx6qdl_icore_nand_defconfig index 3b579ba..59c6d6b 100644 --- a/configs/imx6qdl_icore_nand_defconfig +++ b/configs/imx6qdl_icore_nand_defconfig @@ -12,7 +12,6 @@ CONFIG_MX6QDL=y CONFIG_TARGET_MX6Q_ENGICAM=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore" CONFIG_SPL_TEXT_BASE=0x00908000 -CONFIG_SYS_PROMPT="icorem6qdl> " CONFIG_SPL_SERIAL=y CONFIG_SPL=y # CONFIG_CMD_BMODE is not set @@ -31,6 +30,7 @@ CONFIG_SPL_DMA=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="icorem6qdl> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=541 CONFIG_CMD_MEMTEST=y diff --git a/configs/imx6qdl_icore_rqs_defconfig b/configs/imx6qdl_icore_rqs_defconfig index 697e4c2..d5a69b3 100644 --- a/configs/imx6qdl_icore_rqs_defconfig +++ b/configs/imx6qdl_icore_rqs_defconfig @@ -12,7 +12,6 @@ CONFIG_MX6QDL=y CONFIG_TARGET_MX6Q_ENGICAM=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore-rqs" CONFIG_SPL_TEXT_BASE=0x00908000 -CONFIG_SYS_PROMPT="icorem6qdl-rqs> " CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -40,6 +39,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x800 CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x10 CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="icorem6qdl-rqs> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=545 CONFIG_CMD_SPL=y diff --git a/configs/imx6ul_geam_mmc_defconfig b/configs/imx6ul_geam_mmc_defconfig index 87d693c..a33d2ac 100644 --- a/configs/imx6ul_geam_mmc_defconfig +++ b/configs/imx6ul_geam_mmc_defconfig @@ -12,7 +12,6 @@ CONFIG_MX6UL=y CONFIG_TARGET_MX6UL_ENGICAM=y CONFIG_DEFAULT_DEVICE_TREE="imx6ul-geam" CONFIG_SPL_TEXT_BASE=0x00908000 -CONFIG_SYS_PROMPT="geam6ul> " CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -33,6 +32,7 @@ CONFIG_SPL_RAW_IMAGE_SUPPORT=y CONFIG_SYS_SPL_MALLOC=y CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="geam6ul> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=538 CONFIG_CRC32_VERIFY=y diff --git a/configs/imx6ul_geam_nand_defconfig b/configs/imx6ul_geam_nand_defconfig index 0b989e6..3767949 100644 --- a/configs/imx6ul_geam_nand_defconfig +++ b/configs/imx6ul_geam_nand_defconfig @@ -12,7 +12,6 @@ CONFIG_MX6UL=y CONFIG_TARGET_MX6UL_ENGICAM=y CONFIG_DEFAULT_DEVICE_TREE="imx6ul-geam" CONFIG_SPL_TEXT_BASE=0x00908000 -CONFIG_SYS_PROMPT="geam6ul> " CONFIG_SPL_SERIAL=y CONFIG_SPL=y # CONFIG_CMD_BMODE is not set @@ -31,6 +30,7 @@ CONFIG_SPL_DMA=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="geam6ul> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=538 CONFIG_CRC32_VERIFY=y diff --git a/configs/imx6ul_isiot_emmc_defconfig b/configs/imx6ul_isiot_emmc_defconfig index e7242ca..fe31e85 100644 --- a/configs/imx6ul_isiot_emmc_defconfig +++ b/configs/imx6ul_isiot_emmc_defconfig @@ -12,7 +12,6 @@ CONFIG_MX6UL=y CONFIG_TARGET_MX6UL_ENGICAM=y CONFIG_DEFAULT_DEVICE_TREE="imx6ul-isiot-emmc" CONFIG_SPL_TEXT_BASE=0x00908000 -CONFIG_SYS_PROMPT="isiotmx6ul> " CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -33,6 +32,7 @@ CONFIG_SPL_RAW_IMAGE_SUPPORT=y CONFIG_SYS_SPL_MALLOC=y CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="isiotmx6ul> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=541 CONFIG_CRC32_VERIFY=y diff --git a/configs/imx6ul_isiot_nand_defconfig b/configs/imx6ul_isiot_nand_defconfig index 8318197..6f55ce6 100644 --- a/configs/imx6ul_isiot_nand_defconfig +++ b/configs/imx6ul_isiot_nand_defconfig @@ -12,7 +12,6 @@ CONFIG_MX6UL=y CONFIG_TARGET_MX6UL_ENGICAM=y CONFIG_DEFAULT_DEVICE_TREE="imx6ul-isiot-nand" CONFIG_SPL_TEXT_BASE=0x00908000 -CONFIG_SYS_PROMPT="isiotmx6ul> " CONFIG_SPL_SERIAL=y CONFIG_SPL=y # CONFIG_CMD_BMODE is not set @@ -31,6 +30,7 @@ CONFIG_SPL_DMA=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="isiotmx6ul> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=541 CONFIG_CRC32_VERIFY=y diff --git a/configs/imx8mm-cl-iot-gate-optee_defconfig b/configs/imx8mm-cl-iot-gate-optee_defconfig index 11fdc7f..b99488e 100644 --- a/configs/imx8mm-cl-iot-gate-optee_defconfig +++ b/configs/imx8mm-cl-iot-gate-optee_defconfig @@ -10,7 +10,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mm-cl-iot-gate-optee" CONFIG_SPL_TEXT_BASE=0x7E1000 CONFIG_TARGET_IMX8MM_CL_IOT_GATE_OPTEE=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y @@ -40,6 +39,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074 diff --git a/configs/imx8mm-cl-iot-gate_defconfig b/configs/imx8mm-cl-iot-gate_defconfig index bdabb80..781c7eb 100644 --- a/configs/imx8mm-cl-iot-gate_defconfig +++ b/configs/imx8mm-cl-iot-gate_defconfig @@ -11,7 +11,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mm-cl-iot-gate" CONFIG_SPL_TEXT_BASE=0x7E1000 CONFIG_TARGET_IMX8MM_CL_IOT_GATE=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y @@ -42,6 +41,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074 diff --git a/configs/imx8mm-icore-mx8mm-ctouch2_defconfig b/configs/imx8mm-icore-mx8mm-ctouch2_defconfig index 6d283ec..f94cf70 100644 --- a/configs/imx8mm-icore-mx8mm-ctouch2_defconfig +++ b/configs/imx8mm-icore-mx8mm-ctouch2_defconfig @@ -11,7 +11,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mm-icore-mx8mm-ctouch2" CONFIG_SPL_TEXT_BASE=0x7E1000 CONFIG_TARGET_IMX8MM_ICORE_MX8MM=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -37,6 +36,7 @@ CONFIG_SYS_SPL_MALLOC_SIZE=0x80000 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_POWER=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074 diff --git a/configs/imx8mm-icore-mx8mm-edimm2.2_defconfig b/configs/imx8mm-icore-mx8mm-edimm2.2_defconfig index 38c0c87..49cfb8f 100644 --- a/configs/imx8mm-icore-mx8mm-edimm2.2_defconfig +++ b/configs/imx8mm-icore-mx8mm-edimm2.2_defconfig @@ -11,7 +11,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mm-icore-mx8mm-edimm2.2" CONFIG_SPL_TEXT_BASE=0x7E1000 CONFIG_TARGET_IMX8MM_ICORE_MX8MM=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -37,6 +36,7 @@ CONFIG_SYS_SPL_MALLOC_SIZE=0x80000 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_POWER=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074 diff --git a/configs/imx8mm-mx8menlo_defconfig b/configs/imx8mm-mx8menlo_defconfig index 13bd195..f5b2667 100644 --- a/configs/imx8mm-mx8menlo_defconfig +++ b/configs/imx8mm-mx8menlo_defconfig @@ -11,7 +11,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mm-mx8menlo" CONFIG_SPL_TEXT_BASE=0x7E1000 CONFIG_TARGET_IMX8MM_MX8MENLO=y -CONFIG_SYS_PROMPT="Verdin iMX8MM # " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y @@ -52,6 +51,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y +CONFIG_SYS_PROMPT="Verdin iMX8MM # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2081 diff --git a/configs/imx8mm_beacon_defconfig b/configs/imx8mm_beacon_defconfig index 52edb2e..6e617e0 100644 --- a/configs/imx8mm_beacon_defconfig +++ b/configs/imx8mm_beacon_defconfig @@ -13,7 +13,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mm-beacon-kit" CONFIG_SPL_TEXT_BASE=0x7E1000 CONFIG_TARGET_IMX8MM_BEACON=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -43,6 +42,7 @@ CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074 diff --git a/configs/imx8mm_beacon_fspi_defconfig b/configs/imx8mm_beacon_fspi_defconfig index e1b75d6..fc4ef94 100644 --- a/configs/imx8mm_beacon_fspi_defconfig +++ b/configs/imx8mm_beacon_fspi_defconfig @@ -14,7 +14,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mm-beacon-kit" CONFIG_SPL_TEXT_BASE=0x7E2000 CONFIG_TARGET_IMX8MM_BEACON=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y @@ -47,6 +46,7 @@ CONFIG_SPL_NOR_SUPPORT=y CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074 diff --git a/configs/imx8mm_data_modul_edm_sbc_defconfig b/configs/imx8mm_data_modul_edm_sbc_defconfig index e2bca40..ee673e4 100644 --- a/configs/imx8mm_data_modul_edm_sbc_defconfig +++ b/configs/imx8mm_data_modul_edm_sbc_defconfig @@ -5,7 +5,7 @@ CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y -CONFIG_NR_DRAM_BANKS=1 +CONFIG_NR_DRAM_BANKS=2 CONFIG_SF_DEFAULT_SPEED=50000000 CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0xFFFC0000 @@ -14,7 +14,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mm-data-modul-edm-sbc" CONFIG_SPL_TEXT_BASE=0x7E1000 CONFIG_TARGET_IMX8MM_DATA_MODUL_EDM_SBC=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_SYS_MONITOR_LEN=1048576 @@ -67,6 +66,7 @@ CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_WATCHDOG=y CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074 @@ -157,7 +157,6 @@ CONFIG_SPL_CLK_COMPOSITE_CCF=y CONFIG_CLK_COMPOSITE_CCF=y CONFIG_SPL_CLK_IMX8MM=y CONFIG_CLK_IMX8MM=y -CONFIG_SAVED_DRAM_TIMING_BASE=0x40000000 CONFIG_DFU_TFTP=y CONFIG_DFU_TIMEOUT=y CONFIG_DFU_MMC=y diff --git a/configs/imx8mm_evk_defconfig b/configs/imx8mm_evk_defconfig index ac9810f..0cdffdd 100644 --- a/configs/imx8mm_evk_defconfig +++ b/configs/imx8mm_evk_defconfig @@ -11,7 +11,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mm-evk" CONFIG_SPL_TEXT_BASE=0x7E1000 CONFIG_TARGET_IMX8MM_EVK=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -40,6 +39,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074 @@ -104,6 +104,7 @@ CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_PSCI=y CONFIG_SYSRESET_WATCHDOG=y CONFIG_DM_THERMAL=y +CONFIG_IMX_TMU=y CONFIG_USB=y CONFIG_SPL_USB_HOST=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/imx8mm_evk_fspi_defconfig b/configs/imx8mm_evk_fspi_defconfig index 75f0a95..03d110f 100644 --- a/configs/imx8mm_evk_fspi_defconfig +++ b/configs/imx8mm_evk_fspi_defconfig @@ -14,7 +14,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mm-evk" CONFIG_SPL_TEXT_BASE=0x7E2000 CONFIG_TARGET_IMX8MM_EVK=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -44,6 +43,7 @@ CONFIG_SPL_I2C=y CONFIG_SPL_NOR_SUPPORT=y CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074 diff --git a/configs/imx8mm_phg_defconfig b/configs/imx8mm_phg_defconfig index 9fdce5c..8b3e78d 100644 --- a/configs/imx8mm_phg_defconfig +++ b/configs/imx8mm_phg_defconfig @@ -11,7 +11,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mm-phg" CONFIG_SPL_TEXT_BASE=0x7E1000 CONFIG_TARGET_IMX8MM_PHG=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -40,6 +39,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074 diff --git a/configs/imx8mm_venice_defconfig b/configs/imx8mm_venice_defconfig index a485910..d127d61 100644 --- a/configs/imx8mm_venice_defconfig +++ b/configs/imx8mm_venice_defconfig @@ -11,7 +11,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mm-venice" CONFIG_SPL_TEXT_BASE=0x7E1000 CONFIG_TARGET_IMX8MM_VENICE=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y @@ -46,6 +45,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074 @@ -75,7 +75,7 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y -CONFIG_OF_LIST="imx8mm-venice imx8mm-venice-gw71xx-0x imx8mm-venice-gw72xx-0x imx8mm-venice-gw73xx-0x imx8mm-venice-gw7901 imx8mm-venice-gw7902 imx8mm-venice-gw7903" +CONFIG_OF_LIST="imx8mm-venice imx8mm-venice-gw71xx-0x imx8mm-venice-gw72xx-0x imx8mm-venice-gw73xx-0x imx8mm-venice-gw7901 imx8mm-venice-gw7902 imx8mm-venice-gw7903 imx8mm-venice-gw7904" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_MMC_ENV_DEV=2 diff --git a/configs/imx8mn_beacon_2g_defconfig b/configs/imx8mn_beacon_2g_defconfig index 975fcc2..67dca88 100644 --- a/configs/imx8mn_beacon_2g_defconfig +++ b/configs/imx8mn_beacon_2g_defconfig @@ -15,7 +15,6 @@ CONFIG_DEFAULT_DEVICE_TREE="imx8mn-beacon-kit" CONFIG_SPL_TEXT_BASE=0x912000 CONFIG_TARGET_IMX8MN_BEACON=y CONFIG_IMX8MN_BEACON_2GB_LPDDR=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_SYS_MONITOR_LEN=524288 @@ -52,6 +51,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074 diff --git a/configs/imx8mn_beacon_defconfig b/configs/imx8mn_beacon_defconfig index f4ecdc8..7426bbb 100644 --- a/configs/imx8mn_beacon_defconfig +++ b/configs/imx8mn_beacon_defconfig @@ -14,7 +14,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mn-beacon-kit" CONFIG_SPL_TEXT_BASE=0x912000 CONFIG_TARGET_IMX8MN_BEACON=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_SYS_MONITOR_LEN=524288 @@ -52,6 +51,7 @@ CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074 diff --git a/configs/imx8mn_beacon_fspi_defconfig b/configs/imx8mn_beacon_fspi_defconfig index f5e57fb..021968d 100644 --- a/configs/imx8mn_beacon_fspi_defconfig +++ b/configs/imx8mn_beacon_fspi_defconfig @@ -14,7 +14,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mn-beacon-kit" CONFIG_SPL_TEXT_BASE=0x912000 CONFIG_TARGET_IMX8MN_BEACON=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_SYS_MONITOR_LEN=524288 @@ -52,6 +51,7 @@ CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074 diff --git a/configs/imx8mn_bsh_smm_s2_defconfig b/configs/imx8mn_bsh_smm_s2_defconfig index f356b9c..c3f250e 100644 --- a/configs/imx8mn_bsh_smm_s2_defconfig +++ b/configs/imx8mn_bsh_smm_s2_defconfig @@ -11,7 +11,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mn-bsh-smm-s2" CONFIG_SPL_TEXT_BASE=0x912000 CONFIG_TARGET_IMX8MN_BSH_SMM_S2=y -CONFIG_SYS_PROMPT="> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_SERIAL=y @@ -50,6 +49,7 @@ CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NAND_IDENT=y CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y +CONFIG_SYS_PROMPT="> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2067 diff --git a/configs/imx8mn_bsh_smm_s2pro_defconfig b/configs/imx8mn_bsh_smm_s2pro_defconfig index 57d1131..e60087d 100644 --- a/configs/imx8mn_bsh_smm_s2pro_defconfig +++ b/configs/imx8mn_bsh_smm_s2pro_defconfig @@ -11,7 +11,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mn-bsh-smm-s2pro" CONFIG_SPL_TEXT_BASE=0x912000 CONFIG_TARGET_IMX8MN_BSH_SMM_S2PRO=y -CONFIG_SYS_PROMPT="> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y @@ -46,6 +45,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y +CONFIG_SYS_PROMPT="> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2067 diff --git a/configs/imx8mn_ddr4_evk_defconfig b/configs/imx8mn_ddr4_evk_defconfig index 4faeb47..57b64f7 100644 --- a/configs/imx8mn_ddr4_evk_defconfig +++ b/configs/imx8mn_ddr4_evk_defconfig @@ -11,7 +11,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mn-ddr4-evk" CONFIG_SPL_TEXT_BASE=0x912000 CONFIG_TARGET_IMX8MN_DDR4_EVK=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -43,6 +42,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_I2C=y CONFIG_SPL_WATCHDOG=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074 diff --git a/configs/imx8mn_evk_defconfig b/configs/imx8mn_evk_defconfig index 230ce6b..da329af 100644 --- a/configs/imx8mn_evk_defconfig +++ b/configs/imx8mn_evk_defconfig @@ -11,7 +11,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mn-evk" CONFIG_SPL_TEXT_BASE=0x912000 CONFIG_TARGET_IMX8MN_EVK=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -47,6 +46,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074 diff --git a/configs/imx8mn_var_som_defconfig b/configs/imx8mn_var_som_defconfig index b346b14..54f35a0 100644 --- a/configs/imx8mn_var_som_defconfig +++ b/configs/imx8mn_var_som_defconfig @@ -12,7 +12,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mn-var-som-symphony" CONFIG_SPL_TEXT_BASE=0x912000 CONFIG_TARGET_IMX8MN_VAR_SOM=y -CONFIG_SYS_PROMPT="> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y @@ -49,6 +48,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y +CONFIG_SYS_PROMPT="> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2067 diff --git a/configs/imx8mn_venice_defconfig b/configs/imx8mn_venice_defconfig index 39f930a..290f866 100644 --- a/configs/imx8mn_venice_defconfig +++ b/configs/imx8mn_venice_defconfig @@ -11,7 +11,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mn-venice" CONFIG_SPL_TEXT_BASE=0x912000 CONFIG_TARGET_IMX8MN_VENICE=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y @@ -49,6 +48,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_I2C=y CONFIG_SPL_WATCHDOG=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074 diff --git a/configs/imx8mp-icore-mx8mp-edimm2.2_defconfig b/configs/imx8mp-icore-mx8mp-edimm2.2_defconfig index 494be36..fa56c65 100644 --- a/configs/imx8mp-icore-mx8mp-edimm2.2_defconfig +++ b/configs/imx8mp-icore-mx8mp-edimm2.2_defconfig @@ -14,7 +14,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mp-icore-mx8mp-edimm2.2" CONFIG_SPL_TEXT_BASE=0x920000 CONFIG_TARGET_IMX8MP_ICORE_MX8MP=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -47,6 +46,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074 diff --git a/configs/imx8mp_beacon_defconfig b/configs/imx8mp_beacon_defconfig index c6a3e35..5b8e287 100644 --- a/configs/imx8mp_beacon_defconfig +++ b/configs/imx8mp_beacon_defconfig @@ -16,7 +16,6 @@ CONFIG_DEFAULT_DEVICE_TREE="imx8mp-beacon-kit" CONFIG_SPL_TEXT_BASE=0x920000 CONFIG_SYS_HAS_ARMV8_SECURE_BASE=y CONFIG_TARGET_IMX8MP_BEACON=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -61,6 +60,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074 diff --git a/configs/imx8mp_data_modul_edm_sbc_defconfig b/configs/imx8mp_data_modul_edm_sbc_defconfig index d3b629c..ed2d4fe 100644 --- a/configs/imx8mp_data_modul_edm_sbc_defconfig +++ b/configs/imx8mp_data_modul_edm_sbc_defconfig @@ -15,7 +15,6 @@ CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="imx8mp-data-modul-edm-sbc" CONFIG_SPL_TEXT_BASE=0x920000 CONFIG_TARGET_IMX8MP_DATA_MODUL_EDM_SBC=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_SYS_MONITOR_LEN=1048576 @@ -73,6 +72,7 @@ CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x58000 CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2081 @@ -164,7 +164,6 @@ CONFIG_SPL_CLK_COMPOSITE_CCF=y CONFIG_CLK_COMPOSITE_CCF=y CONFIG_SPL_CLK_IMX8MP=y CONFIG_CLK_IMX8MP=y -CONFIG_SAVED_DRAM_TIMING_BASE=0x40000000 CONFIG_DFU_TFTP=y CONFIG_DFU_TIMEOUT=y CONFIG_DFU_MMC=y diff --git a/configs/imx8mp_dhcom_pdk2_defconfig b/configs/imx8mp_dhcom_pdk2_defconfig index 24c87aa..148d80a 100644 --- a/configs/imx8mp_dhcom_pdk2_defconfig +++ b/configs/imx8mp_dhcom_pdk2_defconfig @@ -15,7 +15,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mp-dhcom-pdk2" CONFIG_SPL_TEXT_BASE=0x920000 CONFIG_TARGET_IMX8MP_DH_DHCOM_PDK2=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_SYS_MONITOR_LEN=1048576 @@ -68,6 +67,7 @@ CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2081 @@ -160,7 +160,6 @@ CONFIG_SPL_CLK_COMPOSITE_CCF=y CONFIG_CLK_COMPOSITE_CCF=y CONFIG_SPL_CLK_IMX8MP=y CONFIG_CLK_IMX8MP=y -CONFIG_SAVED_DRAM_TIMING_BASE=0x40000000 CONFIG_DFU_TFTP=y CONFIG_DFU_TIMEOUT=y CONFIG_DFU_MMC=y diff --git a/configs/imx8mp_dhcom_pdk3_defconfig b/configs/imx8mp_dhcom_pdk3_defconfig index 3e89e0f..6b213c4 100644 --- a/configs/imx8mp_dhcom_pdk3_defconfig +++ b/configs/imx8mp_dhcom_pdk3_defconfig @@ -15,7 +15,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mp-dhcom-pdk3" CONFIG_SPL_TEXT_BASE=0x920000 CONFIG_TARGET_IMX8MP_DH_DHCOM_PDK2=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_SYS_MONITOR_LEN=1048576 @@ -69,6 +68,7 @@ CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2081 @@ -161,7 +161,6 @@ CONFIG_SPL_CLK_COMPOSITE_CCF=y CONFIG_CLK_COMPOSITE_CCF=y CONFIG_SPL_CLK_IMX8MP=y CONFIG_CLK_IMX8MP=y -CONFIG_SAVED_DRAM_TIMING_BASE=0x40000000 CONFIG_DFU_TFTP=y CONFIG_DFU_TIMEOUT=y CONFIG_DFU_MMC=y diff --git a/configs/imx8mp_evk_defconfig b/configs/imx8mp_evk_defconfig index 73e30db..da1f5d1 100644 --- a/configs/imx8mp_evk_defconfig +++ b/configs/imx8mp_evk_defconfig @@ -14,7 +14,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mp-evk" CONFIG_SPL_TEXT_BASE=0x920000 CONFIG_TARGET_IMX8MP_EVK=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -47,6 +46,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074 diff --git a/configs/imx8mp_rsb3720a1_4G_defconfig b/configs/imx8mp_rsb3720a1_4G_defconfig index 02ce80c..817d6c65 100644 --- a/configs/imx8mp_rsb3720a1_4G_defconfig +++ b/configs/imx8mp_rsb3720a1_4G_defconfig @@ -16,7 +16,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mp-rsb3720-a1" CONFIG_SPL_TEXT_BASE=0x920000 CONFIG_TARGET_IMX8MP_RSB3720A1_4G=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y @@ -56,6 +55,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074 diff --git a/configs/imx8mp_rsb3720a1_6G_defconfig b/configs/imx8mp_rsb3720a1_6G_defconfig index d0bf25a..faade0a 100644 --- a/configs/imx8mp_rsb3720a1_6G_defconfig +++ b/configs/imx8mp_rsb3720a1_6G_defconfig @@ -16,7 +16,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mp-rsb3720-a1" CONFIG_SPL_TEXT_BASE=0x920000 CONFIG_TARGET_IMX8MP_RSB3720A1_6G=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y @@ -56,6 +55,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074 diff --git a/configs/imx8mp_venice_defconfig b/configs/imx8mp_venice_defconfig index 294206b..913ec0f 100644 --- a/configs/imx8mp_venice_defconfig +++ b/configs/imx8mp_venice_defconfig @@ -11,7 +11,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mp-venice" CONFIG_SPL_TEXT_BASE=0x920000 CONFIG_TARGET_IMX8MP_VENICE=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y @@ -49,6 +48,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_I2C=y CONFIG_SPL_WATCHDOG=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074 diff --git a/configs/imx8mq_cm_defconfig b/configs/imx8mq_cm_defconfig index 89a7485..de15af8 100644 --- a/configs/imx8mq_cm_defconfig +++ b/configs/imx8mq_cm_defconfig @@ -14,7 +14,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mq-cm" CONFIG_SPL_TEXT_BASE=0x7E1000 CONFIG_TARGET_IMX8MQ_CM=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -42,6 +41,7 @@ CONFIG_SYS_SPL_MALLOC_SIZE=0x80000 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_I2C=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=1050 CONFIG_SYS_BOOTM_LEN=0x2000000 diff --git a/configs/imx8mq_evk_defconfig b/configs/imx8mq_evk_defconfig index 7b135bf..a32150f 100644 --- a/configs/imx8mq_evk_defconfig +++ b/configs/imx8mq_evk_defconfig @@ -14,7 +14,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mq-evk" CONFIG_SPL_TEXT_BASE=0x7E1000 CONFIG_TARGET_IMX8MQ_EVK=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_DM_RESET=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y @@ -47,6 +46,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=1050 # CONFIG_BOOTM_NETBSD is not set diff --git a/configs/imx8mq_reform2_defconfig b/configs/imx8mq_reform2_defconfig index a17a180..3448b61 100644 --- a/configs/imx8mq_reform2_defconfig +++ b/configs/imx8mq_reform2_defconfig @@ -14,7 +14,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mq-mnt-reform2" CONFIG_SPL_TEXT_BASE=0x7E1000 CONFIG_TARGET_IMX8MQ_REFORM2=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_DM_RESET=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y @@ -50,6 +49,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=1050 # CONFIG_BOOTM_NETBSD is not set diff --git a/configs/imx93_11x11_evk_defconfig b/configs/imx93_11x11_evk_defconfig index 65f4738..89130c4 100644 --- a/configs/imx93_11x11_evk_defconfig +++ b/configs/imx93_11x11_evk_defconfig @@ -12,7 +12,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx93-11x11-evk" CONFIG_SPL_TEXT_BASE=0x2049A000 CONFIG_TARGET_IMX93_11X11_EVK=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y @@ -44,6 +43,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x1040 CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074 diff --git a/configs/imx93_11x11_evk_ld_defconfig b/configs/imx93_11x11_evk_ld_defconfig index 27165da..8084032 100644 --- a/configs/imx93_11x11_evk_ld_defconfig +++ b/configs/imx93_11x11_evk_ld_defconfig @@ -13,7 +13,6 @@ CONFIG_DEFAULT_DEVICE_TREE="imx93-11x11-evk" CONFIG_SPL_TEXT_BASE=0x2049A000 CONFIG_IMX9_LOW_DRIVE_MODE=y CONFIG_TARGET_IMX93_11X11_EVK=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y @@ -45,6 +44,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x1040 CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074 diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig index 6a81b97..aa58356 100644 --- a/configs/inetspace_v2_defconfig +++ b/configs/inetspace_v2_defconfig @@ -12,7 +12,6 @@ CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x70000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-is2" -CONFIG_SYS_PROMPT="ns2> " CONFIG_IDENT_STRING=" IS v2" CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_ENV_ADDR=0x70000 @@ -28,6 +27,7 @@ CONFIG_CONSOLE_MUX=y CONFIG_MISC_INIT_R=y CONFIG_RESET_PHY_R=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="ns2> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=1046 CONFIG_CMD_EEPROM=y diff --git a/configs/integratorap_cm720t_defconfig b/configs/integratorap_cm720t_defconfig index 15f2680..360c143 100644 --- a/configs/integratorap_cm720t_defconfig +++ b/configs/integratorap_cm720t_defconfig @@ -8,7 +8,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x7ffff20 CONFIG_ENV_SIZE=0x8000 -CONFIG_SYS_PROMPT="Integrator-AP # " CONFIG_SYS_LOAD_ADDR=0x7fc0 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/mtdblock0 console=ttyAM0 console=tty" @@ -19,6 +18,7 @@ CONFIG_MISC_INIT_R=y CONFIG_HUSH_PARSER=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set +CONFIG_SYS_PROMPT="Integrator-AP # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=289 CONFIG_CMD_IMLS=y diff --git a/configs/integratorap_cm920t_defconfig b/configs/integratorap_cm920t_defconfig index f850cca..dedd9e6 100644 --- a/configs/integratorap_cm920t_defconfig +++ b/configs/integratorap_cm920t_defconfig @@ -8,7 +8,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x7ffff20 CONFIG_ENV_SIZE=0x8000 -CONFIG_SYS_PROMPT="Integrator-AP # " CONFIG_SYS_LOAD_ADDR=0x7fc0 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/mtdblock0 console=ttyAM0 console=tty" @@ -19,6 +18,7 @@ CONFIG_MISC_INIT_R=y CONFIG_HUSH_PARSER=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set +CONFIG_SYS_PROMPT="Integrator-AP # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=289 CONFIG_CMD_IMLS=y diff --git a/configs/integratorap_cm926ejs_defconfig b/configs/integratorap_cm926ejs_defconfig index aac4fbf..0849b25 100644 --- a/configs/integratorap_cm926ejs_defconfig +++ b/configs/integratorap_cm926ejs_defconfig @@ -8,7 +8,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x7ffff20 CONFIG_ENV_SIZE=0x8000 -CONFIG_SYS_PROMPT="Integrator-AP # " CONFIG_SYS_LOAD_ADDR=0x7fc0 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/mtdblock0 console=ttyAM0 console=tty" @@ -19,6 +18,7 @@ CONFIG_MISC_INIT_R=y CONFIG_HUSH_PARSER=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set +CONFIG_SYS_PROMPT="Integrator-AP # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=289 CONFIG_CMD_IMLS=y diff --git a/configs/integratorap_cm946es_defconfig b/configs/integratorap_cm946es_defconfig index b00e20d..26c15b5 100644 --- a/configs/integratorap_cm946es_defconfig +++ b/configs/integratorap_cm946es_defconfig @@ -8,7 +8,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x7ffff20 CONFIG_ENV_SIZE=0x8000 -CONFIG_SYS_PROMPT="Integrator-AP # " CONFIG_SYS_LOAD_ADDR=0x7fc0 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/mtdblock0 console=ttyAM0 console=tty" @@ -19,6 +18,7 @@ CONFIG_MISC_INIT_R=y CONFIG_HUSH_PARSER=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set +CONFIG_SYS_PROMPT="Integrator-AP # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=289 CONFIG_CMD_IMLS=y diff --git a/configs/integratorcp_cm1136_defconfig b/configs/integratorcp_cm1136_defconfig index dc66574..a29536a 100644 --- a/configs/integratorcp_cm1136_defconfig +++ b/configs/integratorcp_cm1136_defconfig @@ -9,7 +9,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x7ffff20 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x40000 -CONFIG_SYS_PROMPT="Integrator-CP # " CONFIG_SYS_MONITOR_LEN=1048576 CONFIG_SYS_LOAD_ADDR=0x7fc0 CONFIG_ENV_ADDR=0x24F00000 @@ -24,6 +23,7 @@ CONFIG_MISC_INIT_R=y CONFIG_HUSH_PARSER=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set +CONFIG_SYS_PROMPT="Integrator-CP # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=289 CONFIG_CMD_IMLS=y diff --git a/configs/integratorcp_cm920t_defconfig b/configs/integratorcp_cm920t_defconfig index 99af99f..00e3dd8 100644 --- a/configs/integratorcp_cm920t_defconfig +++ b/configs/integratorcp_cm920t_defconfig @@ -9,7 +9,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x7ffff20 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x40000 -CONFIG_SYS_PROMPT="Integrator-CP # " CONFIG_SYS_MONITOR_LEN=1048576 CONFIG_SYS_LOAD_ADDR=0x7fc0 CONFIG_ENV_ADDR=0x24F00000 @@ -24,6 +23,7 @@ CONFIG_MISC_INIT_R=y CONFIG_HUSH_PARSER=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set +CONFIG_SYS_PROMPT="Integrator-CP # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=289 CONFIG_CMD_IMLS=y diff --git a/configs/integratorcp_cm926ejs_defconfig b/configs/integratorcp_cm926ejs_defconfig index 1c6e812..ccc054e 100644 --- a/configs/integratorcp_cm926ejs_defconfig +++ b/configs/integratorcp_cm926ejs_defconfig @@ -9,7 +9,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x7ffff20 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x40000 -CONFIG_SYS_PROMPT="Integrator-CP # " CONFIG_SYS_MONITOR_LEN=1048576 CONFIG_SYS_LOAD_ADDR=0x7fc0 CONFIG_ENV_ADDR=0x24F00000 @@ -24,6 +23,7 @@ CONFIG_MISC_INIT_R=y CONFIG_HUSH_PARSER=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set +CONFIG_SYS_PROMPT="Integrator-CP # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=289 CONFIG_CMD_IMLS=y diff --git a/configs/integratorcp_cm946es_defconfig b/configs/integratorcp_cm946es_defconfig index 54f84a2..dabfe29 100644 --- a/configs/integratorcp_cm946es_defconfig +++ b/configs/integratorcp_cm946es_defconfig @@ -9,7 +9,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x7ffff20 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x40000 -CONFIG_SYS_PROMPT="Integrator-CP # " CONFIG_SYS_MONITOR_LEN=1048576 CONFIG_SYS_LOAD_ADDR=0x7fc0 CONFIG_ENV_ADDR=0x24F00000 @@ -24,6 +23,7 @@ CONFIG_MISC_INIT_R=y CONFIG_HUSH_PARSER=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set +CONFIG_SYS_PROMPT="Integrator-CP # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=289 CONFIG_CMD_IMLS=y diff --git a/configs/iot2050_defconfig b/configs/iot2050_defconfig index bcbaa92..4fc3bcb 100644 --- a/configs/iot2050_defconfig +++ b/configs/iot2050_defconfig @@ -18,7 +18,6 @@ CONFIG_DM_GPIO=y CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="k3-am6528-iot2050-basic" CONFIG_SPL_TEXT_BASE=0x80080000 -CONFIG_SYS_PROMPT="IOT2050> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_SPL_SERIAL=y @@ -41,7 +40,6 @@ CONFIG_AUTOBOOT_FLUSH_STDIN=y CONFIG_AUTOBOOT_PROMPT="Hit SPACE to stop autoboot in %d seconds...\n" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_BOOTCOMMAND="run start_watchdog; run distro_bootcmd" -CONFIG_CONSOLE_MUX=y # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL_MAX_SIZE=0x58000 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y @@ -62,6 +60,7 @@ CONFIG_SPL_POWER_DOMAIN=y CONFIG_SPL_SPI_FLASH_SFDP_SUPPORT=y CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x380000 +CONFIG_SYS_PROMPT="IOT2050> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=1050 CONFIG_CMD_ASKENV=y diff --git a/configs/iot_devkit_defconfig b/configs/iot_devkit_defconfig index 4a5bfc5..55ced6b 100644 --- a/configs/iot_devkit_defconfig +++ b/configs/iot_devkit_defconfig @@ -11,11 +11,11 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80008000 CONFIG_ENV_SIZE=0x1000 CONFIG_DEFAULT_DEVICE_TREE="iot_devkit" -CONFIG_SYS_PROMPT="IoTDK# " CONFIG_SYS_CLK_FREQ=16000000 CONFIG_SYS_LOAD_ADDR=0x30000000 CONFIG_LOCALVERSION="-iotdk-1.0" # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set +CONFIG_SYS_PROMPT="IoTDK# " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=280 # CONFIG_CMD_BOOTD is not set diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig index d808628..2a2e5f5 100644 --- a/configs/jetson-tk1_defconfig +++ b/configs/jetson-tk1_defconfig @@ -10,7 +10,6 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFFE000 CONFIG_DEFAULT_DEVICE_TREE="tegra124-jetson-tk1" CONFIG_SPL_TEXT_BASE=0x80108000 -CONFIG_SYS_PROMPT="Tegra124 (Jetson TK1) # " CONFIG_SPL_STACK=0x800ffffc CONFIG_TEGRA124=y CONFIG_TARGET_JETSON_TK1=y @@ -28,6 +27,7 @@ CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x80090000 CONFIG_SYS_SPL_MALLOC_SIZE=0x10000 +CONFIG_SYS_PROMPT="Tegra124 (Jetson TK1) # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2089 # CONFIG_CMD_IMI is not set diff --git a/configs/khadas-edge-captain-rk3399_defconfig b/configs/khadas-edge-captain-rk3399_defconfig index 2800c47..ed06fe7 100644 --- a/configs/khadas-edge-captain-rk3399_defconfig +++ b/configs/khadas-edge-captain-rk3399_defconfig @@ -8,7 +8,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-khadas-edge-captain" -CONFIG_SYS_PROMPT="kedge# " CONFIG_ROCKCHIP_RK3399=y CONFIG_TARGET_EVB_RK3399=y CONFIG_SPL_STACK=0x400000 @@ -29,6 +28,7 @@ CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y CONFIG_TPL=y +CONFIG_SYS_PROMPT="kedge# " CONFIG_SYS_PBSIZE=1048 CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPT=y diff --git a/configs/khadas-edge-rk3399_defconfig b/configs/khadas-edge-rk3399_defconfig index 33b2afd..9df945e 100644 --- a/configs/khadas-edge-rk3399_defconfig +++ b/configs/khadas-edge-rk3399_defconfig @@ -8,7 +8,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-khadas-edge" -CONFIG_SYS_PROMPT="kedge# " CONFIG_ROCKCHIP_RK3399=y CONFIG_TARGET_EVB_RK3399=y CONFIG_SPL_STACK=0x400000 @@ -29,6 +28,7 @@ CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y CONFIG_TPL=y +CONFIG_SYS_PROMPT="kedge# " CONFIG_SYS_PBSIZE=1048 CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPT=y diff --git a/configs/khadas-edge-v-rk3399_defconfig b/configs/khadas-edge-v-rk3399_defconfig index f7a6445..e216c0e 100644 --- a/configs/khadas-edge-v-rk3399_defconfig +++ b/configs/khadas-edge-v-rk3399_defconfig @@ -8,7 +8,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-khadas-edge-v" -CONFIG_SYS_PROMPT="kedge# " CONFIG_ROCKCHIP_RK3399=y CONFIG_TARGET_EVB_RK3399=y CONFIG_SPL_STACK=0x400000 @@ -29,6 +28,7 @@ CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y CONFIG_TPL=y +CONFIG_SYS_PROMPT="kedge# " CONFIG_SYS_PBSIZE=1048 CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPT=y diff --git a/configs/librem5_defconfig b/configs/librem5_defconfig index 973b2ea..166ef5f 100644 --- a/configs/librem5_defconfig +++ b/configs/librem5_defconfig @@ -14,7 +14,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mq-librem5-r4" CONFIG_SPL_TEXT_BASE=0x7E1000 CONFIG_TARGET_LIBREM5=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_DM_RESET=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y @@ -51,6 +50,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=1050 CONFIG_CMD_MEMTEST=y diff --git a/configs/malta64_defconfig b/configs/malta64_defconfig index a69e193..62e759c 100644 --- a/configs/malta64_defconfig +++ b/configs/malta64_defconfig @@ -5,7 +5,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="mti,malta" -CONFIG_SYS_PROMPT="malta # " CONFIG_SYS_LOAD_ADDR=0xffffffff81000000 CONFIG_ENV_ADDR=0xFFFFFFFFBE3E0000 CONFIG_TARGET_MALTA=y @@ -16,6 +15,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_MISC_INIT_R=y CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="malta # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 CONFIG_SYS_BOOTM_LEN=0x4000000 diff --git a/configs/malta64el_defconfig b/configs/malta64el_defconfig index 21a291d..12153a6 100644 --- a/configs/malta64el_defconfig +++ b/configs/malta64el_defconfig @@ -5,7 +5,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="mti,malta" -CONFIG_SYS_PROMPT="maltael # " CONFIG_SYS_LOAD_ADDR=0xffffffff81000000 CONFIG_ENV_ADDR=0xFFFFFFFFBE3E0000 CONFIG_TARGET_MALTA=y @@ -18,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_MISC_INIT_R=y CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="maltael # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=283 CONFIG_SYS_BOOTM_LEN=0x4000000 diff --git a/configs/malta_defconfig b/configs/malta_defconfig index 8c76ebb..5686003 100644 --- a/configs/malta_defconfig +++ b/configs/malta_defconfig @@ -5,7 +5,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="mti,malta" -CONFIG_SYS_PROMPT="malta # " CONFIG_SYS_LOAD_ADDR=0x81000000 CONFIG_ENV_ADDR=0xBE3E0000 CONFIG_TARGET_MALTA=y @@ -15,6 +14,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_MISC_INIT_R=y CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="malta # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 CONFIG_SYS_BOOTM_LEN=0x4000000 diff --git a/configs/maltael_defconfig b/configs/maltael_defconfig index 4abd3b1..ac2dcc2 100644 --- a/configs/maltael_defconfig +++ b/configs/maltael_defconfig @@ -5,7 +5,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="mti,malta" -CONFIG_SYS_PROMPT="maltael # " CONFIG_SYS_LOAD_ADDR=0x81000000 CONFIG_ENV_ADDR=0xBE3E0000 CONFIG_TARGET_MALTA=y @@ -17,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_MISC_INIT_R=y CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="maltael # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=283 CONFIG_SYS_BOOTM_LEN=0x4000000 diff --git a/configs/medcom-wide_defconfig b/configs/medcom-wide_defconfig index e99bb8f..8ed0c7a 100644 --- a/configs/medcom-wide_defconfig +++ b/configs/medcom-wide_defconfig @@ -7,7 +7,6 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x1FFE0000 CONFIG_DEFAULT_DEVICE_TREE="tegra20-medcom-wide" CONFIG_SPL_TEXT_BASE=0x00108000 -CONFIG_SYS_PROMPT="Tegra20 (Medcom-Wide) # " CONFIG_SPL_STACK=0xffffc CONFIG_TEGRA20=y CONFIG_TARGET_MEDCOM_WIDE=y @@ -23,6 +22,7 @@ CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x90000 CONFIG_SYS_SPL_MALLOC_SIZE=0x10000 +CONFIG_SYS_PROMPT="Tegra20 (Medcom-Wide) # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2089 # CONFIG_CMD_IMI is not set diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index 589da32..785c71e 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -6,7 +6,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x20000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="microblaze-generic" -CONFIG_SYS_PROMPT="U-Boot-mONStR> " CONFIG_SPL_SERIAL=y CONFIG_SPL_STACK=0x100000 CONFIG_SPL=y @@ -34,6 +33,7 @@ CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set CONFIG_SPL_NOR_SUPPORT=y +CONFIG_SYS_PROMPT="U-Boot-mONStR> " CONFIG_SYS_MAXARGS=15 CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=544 diff --git a/configs/microchip_mpfs_icicle_defconfig b/configs/microchip_mpfs_icicle_defconfig index fa49d38..fef7b13 100644 --- a/configs/microchip_mpfs_icicle_defconfig +++ b/configs/microchip_mpfs_icicle_defconfig @@ -5,7 +5,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000 CONFIG_ENV_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="mpfs-icicle-kit" -CONFIG_SYS_PROMPT="RISC-V # " CONFIG_SYS_MEM_TOP_HIDE=0x400000 CONFIG_SYS_LOAD_ADDR=0x80200000 CONFIG_TARGET_MICROCHIP_ICICLE=y @@ -15,6 +14,7 @@ CONFIG_FIT=y CONFIG_DISTRO_DEFAULTS=y CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y +CONFIG_SYS_PROMPT="RISC-V # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=282 CONFIG_SYS_BOOTM_LEN=0x4000000 diff --git a/configs/msc_sm2s_imx8mp_defconfig b/configs/msc_sm2s_imx8mp_defconfig index 323a704..e8b38e2 100644 --- a/configs/msc_sm2s_imx8mp_defconfig +++ b/configs/msc_sm2s_imx8mp_defconfig @@ -10,7 +10,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mp-msc-sm2s" CONFIG_SPL_TEXT_BASE=0x920000 CONFIG_TARGET_MSC_SM2S_IMX8MP=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -44,6 +43,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074 diff --git a/configs/mscc_jr2_defconfig b/configs/mscc_jr2_defconfig index e3ff906..ad0c42e 100644 --- a/configs/mscc_jr2_defconfig +++ b/configs/mscc_jr2_defconfig @@ -6,7 +6,6 @@ CONFIG_ENV_OFFSET=0x100000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="jr2_pcb110" -CONFIG_SYS_PROMPT="jr2 # " CONFIG_DEBUG_UART_BASE=0x70100000 CONFIG_DEBUG_UART_CLOCK=250000000 CONFIG_DEBUG_UART_BOARD_INIT=y @@ -27,6 +26,7 @@ CONFIG_LOGLEVEL=7 CONFIG_BOARD_TYPES=y CONFIG_DISPLAY_CPUINFO=y CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_SYS_PROMPT="jr2 # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=279 # CONFIG_CMD_BDI is not set diff --git a/configs/mscc_luton_defconfig b/configs/mscc_luton_defconfig index e811bc9..9468d03 100644 --- a/configs/mscc_luton_defconfig +++ b/configs/mscc_luton_defconfig @@ -6,7 +6,6 @@ CONFIG_ENV_OFFSET=0x100000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="luton_pcb091" -CONFIG_SYS_PROMPT="luton # " CONFIG_DEBUG_UART_BASE=0x70100000 CONFIG_DEBUG_UART_CLOCK=208333333 CONFIG_DEBUG_UART_BOARD_INIT=y @@ -29,6 +28,7 @@ CONFIG_LOGLEVEL=7 CONFIG_BOARD_TYPES=y CONFIG_DISPLAY_CPUINFO=y CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_SYS_PROMPT="luton # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/mscc_ocelot_defconfig b/configs/mscc_ocelot_defconfig index f3246f2..aa05b79 100644 --- a/configs/mscc_ocelot_defconfig +++ b/configs/mscc_ocelot_defconfig @@ -6,7 +6,6 @@ CONFIG_ENV_OFFSET=0x100000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="ocelot_pcb123" -CONFIG_SYS_PROMPT="ocelot # " CONFIG_DEBUG_UART_BASE=0x70100000 CONFIG_DEBUG_UART_CLOCK=250000000 CONFIG_DEBUG_UART_BOARD_INIT=y @@ -26,6 +25,7 @@ CONFIG_LOGLEVEL=7 CONFIG_BOARD_TYPES=y CONFIG_DISPLAY_CPUINFO=y CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_SYS_PROMPT="ocelot # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=282 # CONFIG_CMD_BDI is not set diff --git a/configs/mscc_serval_defconfig b/configs/mscc_serval_defconfig index 4ff7933..eccb315 100644 --- a/configs/mscc_serval_defconfig +++ b/configs/mscc_serval_defconfig @@ -6,7 +6,6 @@ CONFIG_ENV_OFFSET=0x100000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="serval_pcb106" -CONFIG_SYS_PROMPT="serval # " CONFIG_ENV_OFFSET_REDUND=0x140000 CONFIG_SYS_LOAD_ADDR=0x100000 CONFIG_ARCH_MSCC=y @@ -24,6 +23,7 @@ CONFIG_LOGLEVEL=7 CONFIG_BOARD_TYPES=y CONFIG_DISPLAY_CPUINFO=y CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_SYS_PROMPT="serval # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=282 # CONFIG_CMD_BDI is not set diff --git a/configs/mscc_servalt_defconfig b/configs/mscc_servalt_defconfig index 5f6ed73..116be14 100644 --- a/configs/mscc_servalt_defconfig +++ b/configs/mscc_servalt_defconfig @@ -6,7 +6,6 @@ CONFIG_ENV_OFFSET=0x100000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="servalt_pcb116" -CONFIG_SYS_PROMPT="servalt # " CONFIG_ENV_OFFSET_REDUND=0x140000 CONFIG_SYS_LOAD_ADDR=0x100000 CONFIG_ARCH_MSCC=y @@ -23,6 +22,7 @@ CONFIG_LOGLEVEL=7 CONFIG_BOARD_TYPES=y CONFIG_DISPLAY_CPUINFO=y CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_SYS_PROMPT="servalt # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=283 # CONFIG_CMD_BDI is not set diff --git a/configs/mt7622_rfb_defconfig b/configs/mt7622_rfb_defconfig index a3ad927..0dca752 100644 --- a/configs/mt7622_rfb_defconfig +++ b/configs/mt7622_rfb_defconfig @@ -6,7 +6,6 @@ CONFIG_TEXT_BASE=0x41e00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 CONFIG_DEFAULT_DEVICE_TREE="mt7622-rfb" -CONFIG_SYS_PROMPT="MT7622> " CONFIG_DEBUG_UART_BASE=0x11002000 CONFIG_DEBUG_UART_CLOCK=25000000 CONFIG_SYS_LOAD_ADDR=0x4007ff28 @@ -16,6 +15,7 @@ CONFIG_FIT=y CONFIG_DEFAULT_FDT_FILE="mt7622-rfb" CONFIG_LOGLEVEL=7 CONFIG_LOG=y +CONFIG_SYS_PROMPT="MT7622> " CONFIG_SYS_MAXARGS=8 CONFIG_SYS_PBSIZE=1049 CONFIG_CMD_BOOTMENU=y diff --git a/configs/mt7623a_unielec_u7623_02_defconfig b/configs/mt7623a_unielec_u7623_02_defconfig index 20c84d6..bc50b2d 100644 --- a/configs/mt7623a_unielec_u7623_02_defconfig +++ b/configs/mt7623a_unielec_u7623_02_defconfig @@ -10,7 +10,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x81ffff10 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x100000 CONFIG_DEFAULT_DEVICE_TREE="mt7623a-unielec-u7623-02-emmc" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_TARGET_MT7623=y CONFIG_SYS_LOAD_ADDR=0x84000000 CONFIG_FIT=y @@ -20,6 +19,7 @@ CONFIG_BOOTDELAY=3 CONFIG_DEFAULT_FDT_FILE="mt7623a-unielec-u7623-02-emmc.dtb" CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_MAXARGS=8 CONFIG_SYS_PBSIZE=1049 CONFIG_SYS_BOOTM_LEN=0x4000000 diff --git a/configs/mt7623n_bpir2_defconfig b/configs/mt7623n_bpir2_defconfig index 5e7c1fe..0d35bda 100644 --- a/configs/mt7623n_bpir2_defconfig +++ b/configs/mt7623n_bpir2_defconfig @@ -10,7 +10,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x81ffff10 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x100000 CONFIG_DEFAULT_DEVICE_TREE="mt7623n-bananapi-bpi-r2" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_TARGET_MT7623=y CONFIG_SYS_LOAD_ADDR=0x84000000 CONFIG_FIT=y @@ -20,6 +19,7 @@ CONFIG_BOOTDELAY=3 CONFIG_DEFAULT_FDT_FILE="mt7623n-bananapi-bpi-r2.dtb" CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_MAXARGS=8 CONFIG_SYS_PBSIZE=1049 CONFIG_SYS_BOOTM_LEN=0x4000000 diff --git a/configs/mt7629_rfb_defconfig b/configs/mt7629_rfb_defconfig index 0e3bd4f..1b66447 100644 --- a/configs/mt7629_rfb_defconfig +++ b/configs/mt7629_rfb_defconfig @@ -11,7 +11,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x41fffef0 CONFIG_ENV_SIZE=0x1000 CONFIG_DEFAULT_DEVICE_TREE="mt7629-rfb" CONFIG_SPL_TEXT_BASE=0x201000 -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_TARGET_MT7629=y CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y @@ -36,6 +35,7 @@ CONFIG_SPL_STACK_R=y CONFIG_SPL_NOR_SUPPORT=y CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_MAXARGS=8 CONFIG_SYS_PBSIZE=1049 CONFIG_SYS_BOOTM_LEN=0x4000000 diff --git a/configs/mt7981_emmc_rfb_defconfig b/configs/mt7981_emmc_rfb_defconfig index b3b37b6..3620777 100644 --- a/configs/mt7981_emmc_rfb_defconfig +++ b/configs/mt7981_emmc_rfb_defconfig @@ -8,7 +8,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x80000 CONFIG_ENV_OFFSET=0x300000 CONFIG_DEFAULT_DEVICE_TREE="mt7981-emmc-rfb" -CONFIG_SYS_PROMPT="MT7981> " CONFIG_TARGET_MT7981=y CONFIG_DEBUG_UART_BASE=0x11002000 CONFIG_DEBUG_UART_CLOCK=40000000 @@ -18,6 +17,7 @@ CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="mt7981-emmc-rfb" CONFIG_LOGLEVEL=7 CONFIG_LOG=y +CONFIG_SYS_PROMPT="MT7981> " CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=1049 # CONFIG_BOOTM_NETBSD is not set diff --git a/configs/mt7981_rfb_defconfig b/configs/mt7981_rfb_defconfig index b7ffb4df..b7c794e 100644 --- a/configs/mt7981_rfb_defconfig +++ b/configs/mt7981_rfb_defconfig @@ -6,7 +6,6 @@ CONFIG_TEXT_BASE=0x41e00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 CONFIG_DEFAULT_DEVICE_TREE="mt7981-rfb" -CONFIG_SYS_PROMPT="MT7981> " CONFIG_TARGET_MT7981=y CONFIG_DEBUG_UART_BASE=0x11002000 CONFIG_DEBUG_UART_CLOCK=40000000 @@ -16,6 +15,7 @@ CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="mt7981-rfb" CONFIG_LOGLEVEL=7 CONFIG_LOG=y +CONFIG_SYS_PROMPT="MT7981> " CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=1049 # CONFIG_BOOTM_NETBSD is not set diff --git a/configs/mt7981_sd_rfb_defconfig b/configs/mt7981_sd_rfb_defconfig index 85be9bb..71560a8 100644 --- a/configs/mt7981_sd_rfb_defconfig +++ b/configs/mt7981_sd_rfb_defconfig @@ -8,7 +8,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x80000 CONFIG_ENV_OFFSET=0x300000 CONFIG_DEFAULT_DEVICE_TREE="mt7981-sd-rfb" -CONFIG_SYS_PROMPT="MT7981> " CONFIG_TARGET_MT7981=y CONFIG_DEBUG_UART_BASE=0x11002000 CONFIG_DEBUG_UART_CLOCK=40000000 @@ -18,6 +17,7 @@ CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="mt7981-sd-rfb" CONFIG_LOGLEVEL=7 CONFIG_LOG=y +CONFIG_SYS_PROMPT="MT7981> " CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=1049 # CONFIG_BOOTM_NETBSD is not set diff --git a/configs/mt7986_rfb_defconfig b/configs/mt7986_rfb_defconfig index ac91c93..5523ca3 100644 --- a/configs/mt7986_rfb_defconfig +++ b/configs/mt7986_rfb_defconfig @@ -6,7 +6,6 @@ CONFIG_TEXT_BASE=0x41e00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 CONFIG_DEFAULT_DEVICE_TREE="mt7986a-rfb" -CONFIG_SYS_PROMPT="MT7986> " CONFIG_TARGET_MT7986=y CONFIG_DEBUG_UART_BASE=0x11002000 CONFIG_DEBUG_UART_CLOCK=40000000 @@ -16,6 +15,7 @@ CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="mt7986a-rfb" CONFIG_LOGLEVEL=7 CONFIG_LOG=y +CONFIG_SYS_PROMPT="MT7986> " CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=1049 # CONFIG_BOOTM_NETBSD is not set diff --git a/configs/mt7986a_bpir3_emmc_defconfig b/configs/mt7986a_bpir3_emmc_defconfig index 5b76512..6571801 100644 --- a/configs/mt7986a_bpir3_emmc_defconfig +++ b/configs/mt7986a_bpir3_emmc_defconfig @@ -8,7 +8,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x80000 CONFIG_ENV_OFFSET=0x300000 CONFIG_DEFAULT_DEVICE_TREE="mt7986a-bpi-r3-emmc" -CONFIG_SYS_PROMPT="BPI-R3> " CONFIG_TARGET_MT7986=y CONFIG_DEBUG_UART_BASE=0x11002000 CONFIG_DEBUG_UART_CLOCK=40000000 @@ -18,6 +17,7 @@ CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="mt7986a-bpi-r3-emmc" CONFIG_LOGLEVEL=7 CONFIG_LOG=y +CONFIG_SYS_PROMPT="BPI-R3> " CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=1049 # CONFIG_BOOTM_NETBSD is not set diff --git a/configs/mt7986a_bpir3_sd_defconfig b/configs/mt7986a_bpir3_sd_defconfig index 36547db..2da81cd 100644 --- a/configs/mt7986a_bpir3_sd_defconfig +++ b/configs/mt7986a_bpir3_sd_defconfig @@ -8,7 +8,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x80000 CONFIG_ENV_OFFSET=0x300000 CONFIG_DEFAULT_DEVICE_TREE="mt7986a-bpi-r3-sd" -CONFIG_SYS_PROMPT="BPI-R3> " CONFIG_TARGET_MT7986=y CONFIG_DEBUG_UART_BASE=0x11002000 CONFIG_DEBUG_UART_CLOCK=40000000 @@ -18,6 +17,7 @@ CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="mt7986a-bpi-r3-sd" CONFIG_LOGLEVEL=7 CONFIG_LOG=y +CONFIG_SYS_PROMPT="BPI-R3> " CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=1049 # CONFIG_BOOTM_NETBSD is not set diff --git a/configs/mt7988_rfb_defconfig b/configs/mt7988_rfb_defconfig index ced52ed..4424abb 100644 --- a/configs/mt7988_rfb_defconfig +++ b/configs/mt7988_rfb_defconfig @@ -6,7 +6,6 @@ CONFIG_TEXT_BASE=0x41e00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 CONFIG_DEFAULT_DEVICE_TREE="mt7988-rfb" -CONFIG_SYS_PROMPT="MT7988> " CONFIG_TARGET_MT7988=y CONFIG_DEBUG_UART_BASE=0x11000000 CONFIG_DEBUG_UART_CLOCK=40000000 @@ -16,6 +15,7 @@ CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="mt7988-rfb" CONFIG_LOGLEVEL=7 CONFIG_LOG=y +CONFIG_SYS_PROMPT="MT7988> " CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=1049 # CONFIG_BOOTM_NETBSD is not set diff --git a/configs/mt7988_sd_rfb_defconfig b/configs/mt7988_sd_rfb_defconfig index 670f5ea..de6aca4 100644 --- a/configs/mt7988_sd_rfb_defconfig +++ b/configs/mt7988_sd_rfb_defconfig @@ -6,7 +6,6 @@ CONFIG_TEXT_BASE=0x41e00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 CONFIG_DEFAULT_DEVICE_TREE="mt7988-sd-rfb" -CONFIG_SYS_PROMPT="MT7988> " CONFIG_TARGET_MT7988=y CONFIG_DEBUG_UART_BASE=0x11000000 CONFIG_DEBUG_UART_CLOCK=40000000 @@ -16,6 +15,7 @@ CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="mt7988-sd-rfb" CONFIG_LOGLEVEL=7 CONFIG_LOG=y +CONFIG_SYS_PROMPT="MT7988> " CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=1049 # CONFIG_BOOTM_NETBSD is not set diff --git a/configs/mt8512_bm1_emmc_defconfig b/configs/mt8512_bm1_emmc_defconfig index 772306c..9a653f1 100644 --- a/configs/mt8512_bm1_emmc_defconfig +++ b/configs/mt8512_bm1_emmc_defconfig @@ -9,12 +9,12 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x1000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="mt8512-bm1-emmc" -CONFIG_SYS_PROMPT="MT8512> " CONFIG_TARGET_MT8512=y CONFIG_SYS_LOAD_ADDR=0x41000000 CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_DEFAULT_FDT_FILE="mt8512-bm1-emmc.dtb" +CONFIG_SYS_PROMPT="MT8512> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 CONFIG_CMD_BOOTMENU=y diff --git a/configs/mt8518_ap1_emmc_defconfig b/configs/mt8518_ap1_emmc_defconfig index d75e299..dbe767a 100644 --- a/configs/mt8518_ap1_emmc_defconfig +++ b/configs/mt8518_ap1_emmc_defconfig @@ -8,13 +8,13 @@ CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x1000 CONFIG_DEFAULT_DEVICE_TREE="mt8518-ap1-emmc" -CONFIG_SYS_PROMPT="MT8518> " CONFIG_TARGET_MT8518=y CONFIG_SYS_LOAD_ADDR=0x41000000 CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_DEFAULT_FDT_FILE="mt8518-ap1-emmc.dtb" CONFIG_BOARD_LATE_INIT=y +CONFIG_SYS_PROMPT="MT8518> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 CONFIG_CMD_BOOTMENU=y diff --git a/configs/mvebu_crb_cn9130_defconfig b/configs/mvebu_crb_cn9130_defconfig index d7a3d6f..ce9dcf8 100644 --- a/configs/mvebu_crb_cn9130_defconfig +++ b/configs/mvebu_crb_cn9130_defconfig @@ -9,7 +9,6 @@ CONFIG_TARGET_OCTEONTX2_CN913x=y CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0x3f0000 CONFIG_DEFAULT_DEVICE_TREE="cn9130-crb-A" -CONFIG_SYS_PROMPT="Marvell>> " CONFIG_DEBUG_UART_BASE=0xf0512000 CONFIG_DEBUG_UART_CLOCK=200000000 CONFIG_SYS_LOAD_ADDR=0x800000 @@ -24,6 +23,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_SYS_PROMPT="Marvell>> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=1051 CONFIG_SYS_BOOTM_LEN=0x800000 diff --git a/configs/mvebu_db_cn9130_defconfig b/configs/mvebu_db_cn9130_defconfig index aa8ac20..35a3af4 100644 --- a/configs/mvebu_db_cn9130_defconfig +++ b/configs/mvebu_db_cn9130_defconfig @@ -11,7 +11,6 @@ CONFIG_ENV_OFFSET=0x3f0000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="cn9130-db-A" -CONFIG_SYS_PROMPT="Marvell>> " CONFIG_DEBUG_UART_BASE=0xf0512000 CONFIG_DEBUG_UART_CLOCK=200000000 CONFIG_SYS_LOAD_ADDR=0x800000 @@ -26,6 +25,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_SYS_PROMPT="Marvell>> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=1051 CONFIG_SYS_BOOTM_LEN=0x800000 diff --git a/configs/n2350_defconfig b/configs/n2350_defconfig index 7f0c3f2..109f0e1 100644 --- a/configs/n2350_defconfig +++ b/configs/n2350_defconfig @@ -18,7 +18,6 @@ CONFIG_ENV_OFFSET=0x100000 CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_DEFAULT_DEVICE_TREE="armada-385-thecus-n2350" CONFIG_SPL_TEXT_BASE=0x40000030 -CONFIG_SYS_PROMPT="N2350 > " CONFIG_SPL_SERIAL=y CONFIG_SPL_STACK=0x4002c000 CONFIG_SPL=y @@ -43,6 +42,7 @@ CONFIG_SPL_BSS_MAX_SIZE=0x4000 CONFIG_SPL_SYS_MALLOC_SIMPLE=y # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set CONFIG_SPL_I2C=y +CONFIG_SYS_PROMPT="N2350 > " CONFIG_SYS_MAXARGS=32 CONFIG_CMD_GPIO=y CONFIG_CMD_GPIO_READ=y diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig index 996bd18..4dbd462 100644 --- a/configs/nas220_defconfig +++ b/configs/nas220_defconfig @@ -11,7 +11,6 @@ CONFIG_TARGET_NAS220=y CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0xA0000 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-blackarmor-nas220" -CONFIG_SYS_PROMPT="nas220> " CONFIG_IDENT_STRING="\nNAS 220" CONFIG_SYS_LOAD_ADDR=0x800000 # CONFIG_SYS_MALLOC_F is not set @@ -21,6 +20,7 @@ CONFIG_USE_PREBOOT=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_RESET_PHY_R=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="nas220> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=1049 # CONFIG_CMD_FLASH is not set diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig index 94ef73f..ab06f54 100644 --- a/configs/net2big_v2_defconfig +++ b/configs/net2big_v2_defconfig @@ -13,7 +13,6 @@ CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x70000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-net2big" -CONFIG_SYS_PROMPT="2big2> " CONFIG_IDENT_STRING=" 2Big v2" CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_ENV_ADDR=0x70000 @@ -29,6 +28,7 @@ CONFIG_CONSOLE_MUX=y CONFIG_MISC_INIT_R=y CONFIG_RESET_PHY_R=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="2big2> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=1048 CONFIG_CMD_EEPROM=y diff --git a/configs/netgear_cg3100d_ram_defconfig b/configs/netgear_cg3100d_ram_defconfig index 0cc90c6..867c0ec 100644 --- a/configs/netgear_cg3100d_ram_defconfig +++ b/configs/netgear_cg3100d_ram_defconfig @@ -5,7 +5,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="netgear,cg3100d" -CONFIG_SYS_PROMPT="CG3100D # " CONFIG_DM_RESET=y CONFIG_SYS_LOAD_ADDR=0x80100000 CONFIG_ARCH_BMIPS=y @@ -20,6 +19,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DISPLAY_CPUINFO=y CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="CG3100D # " CONFIG_SYS_MAXARGS=24 CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=539 diff --git a/configs/netgear_dgnd3700v2_ram_defconfig b/configs/netgear_dgnd3700v2_ram_defconfig index 42d007b..5768e66 100644 --- a/configs/netgear_dgnd3700v2_ram_defconfig +++ b/configs/netgear_dgnd3700v2_ram_defconfig @@ -5,7 +5,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="netgear,dgnd3700v2" -CONFIG_SYS_PROMPT="DGND3700v2 # " CONFIG_DM_RESET=y CONFIG_SYS_LOAD_ADDR=0x80100000 CONFIG_ARCH_BMIPS=y @@ -23,6 +22,7 @@ CONFIG_DISPLAY_CPUINFO=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="DGND3700v2 # " CONFIG_SYS_MAXARGS=24 CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=542 diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig index 02cf49c..b06f5c0 100644 --- a/configs/netspace_lite_v2_defconfig +++ b/configs/netspace_lite_v2_defconfig @@ -13,7 +13,6 @@ CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x70000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ns2lite" -CONFIG_SYS_PROMPT="ns2> " CONFIG_IDENT_STRING=" NS v2 Lite" CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_ENV_ADDR=0x70000 @@ -29,6 +28,7 @@ CONFIG_CONSOLE_MUX=y CONFIG_MISC_INIT_R=y CONFIG_RESET_PHY_R=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="ns2> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=1046 CONFIG_CMD_EEPROM=y diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig index 6683bc0..73d2faf 100644 --- a/configs/netspace_max_v2_defconfig +++ b/configs/netspace_max_v2_defconfig @@ -13,7 +13,6 @@ CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x70000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ns2max" -CONFIG_SYS_PROMPT="ns2> " CONFIG_IDENT_STRING=" NS Max v2" CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_ENV_ADDR=0x70000 @@ -29,6 +28,7 @@ CONFIG_CONSOLE_MUX=y CONFIG_MISC_INIT_R=y CONFIG_RESET_PHY_R=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="ns2> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=1046 CONFIG_CMD_EEPROM=y diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig index e810ccb..3281ce8 100644 --- a/configs/netspace_mini_v2_defconfig +++ b/configs/netspace_mini_v2_defconfig @@ -13,7 +13,6 @@ CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x70000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ns2mini" -CONFIG_SYS_PROMPT="ns2> " CONFIG_IDENT_STRING=" NS v2 Mini" CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_ENV_ADDR=0x70000 @@ -29,6 +28,7 @@ CONFIG_CONSOLE_MUX=y CONFIG_MISC_INIT_R=y CONFIG_RESET_PHY_R=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="ns2> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=1046 CONFIG_CMD_EEPROM=y diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig index 6147152..bc81e94 100644 --- a/configs/netspace_v2_defconfig +++ b/configs/netspace_v2_defconfig @@ -13,7 +13,6 @@ CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x70000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ns2" -CONFIG_SYS_PROMPT="ns2> " CONFIG_IDENT_STRING=" NS v2" CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_ENV_ADDR=0x70000 @@ -29,6 +28,7 @@ CONFIG_CONSOLE_MUX=y CONFIG_MISC_INIT_R=y CONFIG_RESET_PHY_R=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="ns2> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=1046 CONFIG_CMD_EEPROM=y diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig deleted file mode 100644 index 8e55069..0000000 --- a/configs/nokia_rx51_defconfig +++ /dev/null @@ -1,76 +0,0 @@ -CONFIG_ARM=y -# CONFIG_SYS_THUMB_BUILD is not set -CONFIG_SYS_L2CACHE_OFF=y -CONFIG_ARCH_OMAP2PLUS=y -CONFIG_SYS_MALLOC_LEN=0xc0000 -CONFIG_TARGET_NOKIA_RX51=y -CONFIG_SYS_LOAD_ADDR=0x80008000 -CONFIG_OPTIMIZE_INLINING=y -CONFIG_LTO=y -# CONFIG_FIT is not set -CONFIG_SUPPORT_RAW_INITRD=y -CONFIG_BOOTDELAY=30 -CONFIG_AUTOBOOT_KEYED=y -CONFIG_AUTOBOOT_MENU_SHOW=y -CONFIG_USE_BOOTCOMMAND=y -CONFIG_BOOTCOMMAND="run sdboot;run emmcboot;run attachboot;echo" -CONFIG_USE_PREBOOT=y -# CONFIG_SYS_DEVICE_NULLDEV is not set -CONFIG_HUSH_PARSER=y -CONFIG_SYS_CBSIZE=256 -CONFIG_SYS_PBSIZE=287 -# CONFIG_CMD_BDI is not set -CONFIG_CMD_BOOTZ=y -# CONFIG_BOOTM_NETBSD is not set -# CONFIG_BOOTM_PLAN9 is not set -# CONFIG_BOOTM_RTEMS is not set -# CONFIG_BOOTM_VXWORKS is not set -CONFIG_CMD_BOOTMENU=y -# CONFIG_CMD_ELF is not set -# CONFIG_CMD_IMI is not set -# CONFIG_CMD_XIMG is not set -# CONFIG_CMD_EXPORTENV is not set -# CONFIG_CMD_IMPORTENV is not set -# CONFIG_CMD_EDITENV is not set -# CONFIG_CMD_SAVEENV is not set -# CONFIG_CMD_ENV_EXISTS is not set -# CONFIG_CMD_FLASH is not set -CONFIG_CMD_GPIO=y -CONFIG_CMD_I2C=y -CONFIG_CMD_MMC=y -CONFIG_CMD_MTD=y -CONFIG_CMD_ONENAND=y -# CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_SLEEP is not set -CONFIG_CMD_EXT2=y -CONFIG_CMD_EXT4=y -CONFIG_CMD_FAT=y -CONFIG_MTDIDS_DEFAULT="onenand0=onenand" -CONFIG_MTDPARTS_DEFAULT="mtdparts=onenand:128k(bootloader)ro,384k(config),256k(log),2m(kernel),2m(initfs),-(rootfs)" -CONFIG_ENV_OVERWRITE=y -CONFIG_SYS_RELOC_GD_ENV_ADDR=y -# CONFIG_NET is not set -# CONFIG_DM_WARN is not set -# CONFIG_DM_DEVICE_REMOVE is not set -# CONFIG_DM_SEQ_ALIAS is not set -# CONFIG_BLOCK_CACHE is not set -CONFIG_DM_I2C=y -CONFIG_DM_KEYBOARD=y -# CONFIG_MMC_HW_PARTITIONING is not set -# CONFIG_MMC_VERBOSE is not set -CONFIG_MMC_OMAP_HS=y -CONFIG_MTD=y -CONFIG_DM_SERIAL=y -CONFIG_SPI=y -CONFIG_USB=y -CONFIG_USB_MUSB_UDC=y -CONFIG_USB_OMAP3=y -CONFIG_VIDEO=y -CONFIG_VIDEO_LOGO=y -# CONFIG_VIDEO_BPP8 is not set -# CONFIG_VIDEO_BPP32 is not set -CONFIG_SYS_WHITE_ON_BLACK=y -CONFIG_SPLASH_SCREEN=y -CONFIG_WATCHDOG_TIMEOUT_MSECS=31000 -CONFIG_WDT=y -# CONFIG_GZIP is not set diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig index b936ae1..ff489562 100644 --- a/configs/nsa310s_defconfig +++ b/configs/nsa310s_defconfig @@ -14,7 +14,6 @@ CONFIG_TARGET_NSA310S=y CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0xE0000 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-nsa310s" -CONFIG_SYS_PROMPT="NSA310s> " CONFIG_DEBUG_UART_BASE=0xf1012000 CONFIG_DEBUG_UART_CLOCK=166666667 CONFIG_IDENT_STRING="\nZyXEL NSA310S/320S 1/2-Bay Power Media Server" @@ -24,6 +23,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=3 CONFIG_USE_PREBOOT=y # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_PROMPT="NSA310s> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=1050 # CONFIG_CMD_FLASH is not set diff --git a/configs/nsim_700_defconfig b/configs/nsim_700_defconfig index d4fd21b..e8782a1 100644 --- a/configs/nsim_700_defconfig +++ b/configs/nsim_700_defconfig @@ -7,7 +7,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80000f30 CONFIG_DEFAULT_DEVICE_TREE="nsim" -CONFIG_SYS_PROMPT="nsim# " CONFIG_DEBUG_UART_BASE=0xf0000000 CONFIG_DEBUG_UART_CLOCK=70000000 CONFIG_SYS_CLK_FREQ=70000000 @@ -16,6 +15,7 @@ CONFIG_DEBUG_UART=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200n8" +CONFIG_SYS_PROMPT="nsim# " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=279 CONFIG_SYS_BOOTM_LEN=0x2000000 diff --git a/configs/nsim_700be_defconfig b/configs/nsim_700be_defconfig index 2e71b79..d04bf66 100644 --- a/configs/nsim_700be_defconfig +++ b/configs/nsim_700be_defconfig @@ -8,7 +8,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80000f30 CONFIG_DEFAULT_DEVICE_TREE="nsim" -CONFIG_SYS_PROMPT="nsim# " CONFIG_DEBUG_UART_BASE=0xf0000000 CONFIG_DEBUG_UART_CLOCK=70000000 CONFIG_SYS_CLK_FREQ=70000000 @@ -17,6 +16,7 @@ CONFIG_DEBUG_UART=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200n8" +CONFIG_SYS_PROMPT="nsim# " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=279 CONFIG_SYS_BOOTM_LEN=0x2000000 diff --git a/configs/nsim_hs38_defconfig b/configs/nsim_hs38_defconfig index 5cc61b0..70a84ca 100644 --- a/configs/nsim_hs38_defconfig +++ b/configs/nsim_hs38_defconfig @@ -8,7 +8,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80000f30 CONFIG_DEFAULT_DEVICE_TREE="nsim" -CONFIG_SYS_PROMPT="nsim# " CONFIG_DEBUG_UART_BASE=0xf0000000 CONFIG_DEBUG_UART_CLOCK=70000000 CONFIG_SYS_CLK_FREQ=70000000 @@ -18,6 +17,7 @@ CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200n8" CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_SYS_PROMPT="nsim# " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=279 CONFIG_SYS_BOOTM_LEN=0x2000000 diff --git a/configs/nsim_hs38be_defconfig b/configs/nsim_hs38be_defconfig index 42aca2a..f94c66d 100644 --- a/configs/nsim_hs38be_defconfig +++ b/configs/nsim_hs38be_defconfig @@ -9,7 +9,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80000f30 CONFIG_DEFAULT_DEVICE_TREE="nsim" -CONFIG_SYS_PROMPT="nsim# " CONFIG_DEBUG_UART_BASE=0xf0000000 CONFIG_DEBUG_UART_CLOCK=70000000 CONFIG_SYS_CLK_FREQ=70000000 @@ -18,6 +17,7 @@ CONFIG_DEBUG_UART=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200n8" +CONFIG_SYS_PROMPT="nsim# " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=279 CONFIG_SYS_BOOTM_LEN=0x2000000 diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig index cc64fac..6435bad 100644 --- a/configs/nyan-big_defconfig +++ b/configs/nyan-big_defconfig @@ -9,7 +9,6 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFFE000 CONFIG_DEFAULT_DEVICE_TREE="tegra124-nyan-big" CONFIG_SPL_TEXT_BASE=0x80108000 -CONFIG_SYS_PROMPT="Tegra124 (Nyan-big) # " CONFIG_SPL_STACK=0x800ffffc CONFIG_BOOTSTAGE_STASH_ADDR=0x83000000 CONFIG_DEBUG_UART_BASE=0x70006000 @@ -34,6 +33,7 @@ CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x80090000 CONFIG_SYS_SPL_MALLOC_SIZE=0x10000 +CONFIG_SYS_PROMPT="Tegra124 (Nyan-big) # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2087 # CONFIG_CMD_IMI is not set diff --git a/configs/octeontx2_95xx_defconfig b/configs/octeontx2_95xx_defconfig index dace990..062f583 100644 --- a/configs/octeontx2_95xx_defconfig +++ b/configs/octeontx2_95xx_defconfig @@ -14,7 +14,6 @@ CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_TARGET_OCTEONTX2_95XX=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="octeontx" -CONFIG_SYS_PROMPT="Marvell> " CONFIG_DEBUG_UART_BASE=0x87e028000000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_SYS_LOAD_ADDR=0x4000000 @@ -37,6 +36,7 @@ CONFIG_BOOTARGS="console=ttyAMA0,115200n8 earlycon=pl011,0x87e028000000 maxcpus= CONFIG_BOARD_EARLY_INIT_R=y CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="Marvell> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=1050 CONFIG_SYS_BOOTM_LEN=0x10000000 diff --git a/configs/octeontx2_96xx_defconfig b/configs/octeontx2_96xx_defconfig index f8dcbf1..de13d0d 100644 --- a/configs/octeontx2_96xx_defconfig +++ b/configs/octeontx2_96xx_defconfig @@ -14,7 +14,6 @@ CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_TARGET_OCTEONTX2_96XX=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="octeontx" -CONFIG_SYS_PROMPT="Marvell> " CONFIG_DEBUG_UART_BASE=0x87e028000000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_SYS_LOAD_ADDR=0x4000000 @@ -37,6 +36,7 @@ CONFIG_BOOTARGS="console=ttyAMA0,115200n8 earlycon=pl011,0x87e028000000 maxcpus= CONFIG_BOARD_EARLY_INIT_R=y CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="Marvell> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=1050 CONFIG_SYS_BOOTM_LEN=0x10000000 diff --git a/configs/octeontx_81xx_defconfig b/configs/octeontx_81xx_defconfig index 2d51abe..070c947 100644 --- a/configs/octeontx_81xx_defconfig +++ b/configs/octeontx_81xx_defconfig @@ -14,7 +14,6 @@ CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_TARGET_OCTEONTX_81XX=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="octeontx" -CONFIG_SYS_PROMPT="Marvell> " CONFIG_DEBUG_UART_BASE=0x87e028000000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_SYS_LOAD_ADDR=0x2800000 @@ -37,6 +36,7 @@ CONFIG_BOOTARGS="console=ttyAMA0,115200n8 earlycon=pl011,0x87e028000000 maxcpus= # CONFIG_DISPLAY_CPUINFO is not set CONFIG_BOARD_EARLY_INIT_R=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="Marvell> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=1050 CONFIG_SYS_BOOTM_LEN=0x10000000 diff --git a/configs/octeontx_83xx_defconfig b/configs/octeontx_83xx_defconfig index 656ff53..6e722d7 100644 --- a/configs/octeontx_83xx_defconfig +++ b/configs/octeontx_83xx_defconfig @@ -14,7 +14,6 @@ CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_TARGET_OCTEONTX_83XX=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="octeontx" -CONFIG_SYS_PROMPT="Marvell> " CONFIG_DEBUG_UART_BASE=0x87e028000000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_SYS_LOAD_ADDR=0x2800000 @@ -35,6 +34,7 @@ CONFIG_BOOTARGS="console=ttyAMA0,115200n8 earlycon=pl011,0x87e028000000 maxcpus= # CONFIG_DISPLAY_CPUINFO is not set CONFIG_BOARD_EARLY_INIT_R=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="Marvell> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=1050 CONFIG_SYS_BOOTM_LEN=0x10000000 diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig index bb12c9f..3f03a9d 100644 --- a/configs/odroid-xu3_defconfig +++ b/configs/odroid-xu3_defconfig @@ -13,7 +13,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x42e00000 CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_OFFSET=0x310000 CONFIG_DEFAULT_DEVICE_TREE="exynos5422-odroidxu3" -CONFIG_SYS_PROMPT="ODROID-XU3 # " CONFIG_IDENT_STRING=" for ODROID-XU3/XU4/HC1/HC2" CONFIG_SYS_MEM_TOP_HIDE=0x01600000 CONFIG_SYS_LOAD_ADDR=0x43e00000 @@ -28,6 +27,7 @@ CONFIG_BOARD_TYPES=y CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOARD_LATE_INIT=y CONFIG_MISC_INIT_R=y +CONFIG_SYS_PROMPT="ODROID-XU3 # " CONFIG_SYS_PBSIZE=1024 CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_DFU=y diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig index b1943cf..45e2ed8 100644 --- a/configs/odroid_defconfig +++ b/configs/odroid_defconfig @@ -15,7 +15,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x43dfff10 CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_OFFSET=0x140000 CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid" -CONFIG_SYS_PROMPT="Odroid # " CONFIG_SYS_MONITOR_LEN=262144 CONFIG_SYS_MEM_TOP_HIDE=0x00100000 CONFIG_SYS_LOAD_ADDR=0x43e00000 @@ -31,6 +30,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_BOARD_TYPES=y CONFIG_BOARD_LATE_INIT=y CONFIG_MISC_INIT_R=y +CONFIG_SYS_PROMPT="Odroid # " CONFIG_SYS_PBSIZE=1024 # CONFIG_CMD_XIMG is not set CONFIG_CMD_THOR_DOWNLOAD=y diff --git a/configs/omap35_logic_defconfig b/configs/omap35_logic_defconfig index b8c48e6..f6652eb 100644 --- a/configs/omap35_logic_defconfig +++ b/configs/omap35_logic_defconfig @@ -13,7 +13,6 @@ CONFIG_DEFAULT_DEVICE_TREE="logicpd-torpedo-35xx-devkit" CONFIG_SPL_TEXT_BASE=0x40200000 CONFIG_TARGET_OMAP3_LOGIC=y # CONFIG_SPL_OMAP3_ID_NAND is not set -CONFIG_SYS_PROMPT="OMAP Logic # " CONFIG_SYS_MONITOR_LEN=262144 CONFIG_SPL=y CONFIG_LTO=y @@ -43,6 +42,7 @@ CONFIG_SPL_FALCON_BOOT_MMCSD=y CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700 CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500 CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200 +CONFIG_SYS_PROMPT="OMAP Logic # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=1054 # CONFIG_CMD_IMI is not set diff --git a/configs/omap35_logic_somlv_defconfig b/configs/omap35_logic_somlv_defconfig index d9b7e0d..680b88e 100644 --- a/configs/omap35_logic_somlv_defconfig +++ b/configs/omap35_logic_somlv_defconfig @@ -13,7 +13,6 @@ CONFIG_DEFAULT_DEVICE_TREE="logicpd-som-lv-35xx-devkit" CONFIG_SPL_TEXT_BASE=0x40200000 CONFIG_TARGET_OMAP3_LOGIC=y # CONFIG_SPL_OMAP3_ID_NAND is not set -CONFIG_SYS_PROMPT="OMAP Logic # " CONFIG_SYS_MONITOR_LEN=262144 CONFIG_SPL=y CONFIG_LTO=y @@ -45,6 +44,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700 CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500 CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200 # CONFIG_SPL_POWER is not set +CONFIG_SYS_PROMPT="OMAP Logic # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=1054 # CONFIG_CMD_IMI is not set diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index a1d4301..d475378 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -9,7 +9,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x4020ff00 CONFIG_DEFAULT_DEVICE_TREE="omap3-beagle" CONFIG_SPL_TEXT_BASE=0x40200000 CONFIG_TARGET_OMAP3_BEAGLE=y -CONFIG_SYS_PROMPT="BeagleBoard # " CONFIG_SYS_MONITOR_LEN=262144 CONFIG_SPL_SYS_MALLOC_F_LEN=0x400 CONFIG_SPL=y @@ -28,6 +27,7 @@ CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_SPL_NAND_BASE=y +CONFIG_SYS_PROMPT="BeagleBoard # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=1055 CONFIG_CMD_SPL=y diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index 34f7d8c..1aa4850 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -9,7 +9,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x4020ff00 CONFIG_DEFAULT_DEVICE_TREE="omap3-evm" CONFIG_SPL_TEXT_BASE=0x40200000 CONFIG_TARGET_OMAP3_EVM=y -CONFIG_SYS_PROMPT="OMAP3_EVM # " CONFIG_SYS_MONITOR_LEN=262144 CONFIG_SPL_SYS_MALLOC_F_LEN=0x400 CONFIG_SPL=y @@ -28,6 +27,7 @@ CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_SPL_NAND_BASE=y +CONFIG_SYS_PROMPT="OMAP3_EVM # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=1053 CONFIG_CMD_SPL=y diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index 90c1b6c..cc1f418 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -13,7 +13,6 @@ CONFIG_DEFAULT_DEVICE_TREE="logicpd-torpedo-37xx-devkit" CONFIG_SPL_TEXT_BASE=0x40200000 CONFIG_TARGET_OMAP3_LOGIC=y # CONFIG_SPL_OMAP3_ID_NAND is not set -CONFIG_SYS_PROMPT="OMAP Logic # " CONFIG_SYS_MONITOR_LEN=262144 CONFIG_SPL=y CONFIG_LTO=y @@ -42,6 +41,7 @@ CONFIG_SPL_FALCON_BOOT_MMCSD=y CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700 CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500 CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200 +CONFIG_SYS_PROMPT="OMAP Logic # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=1054 # CONFIG_CMD_IMI is not set diff --git a/configs/omap3_logic_somlv_defconfig b/configs/omap3_logic_somlv_defconfig index 17fda31..97041b6 100644 --- a/configs/omap3_logic_somlv_defconfig +++ b/configs/omap3_logic_somlv_defconfig @@ -13,7 +13,6 @@ CONFIG_DEFAULT_DEVICE_TREE="logicpd-som-lv-37xx-devkit" CONFIG_SPL_TEXT_BASE=0x40200000 CONFIG_TARGET_OMAP3_LOGIC=y # CONFIG_SPL_OMAP3_ID_NAND is not set -CONFIG_SYS_PROMPT="OMAP Logic # " CONFIG_SYS_MONITOR_LEN=262144 CONFIG_SPL=y CONFIG_LTO=y @@ -45,6 +44,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700 CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500 CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200 # CONFIG_SPL_POWER is not set +CONFIG_SYS_PROMPT="OMAP Logic # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=1054 # CONFIG_CMD_IMI is not set diff --git a/configs/openpiton_riscv64_defconfig b/configs/openpiton_riscv64_defconfig index 6256072..2b335ae 100644 --- a/configs/openpiton_riscv64_defconfig +++ b/configs/openpiton_riscv64_defconfig @@ -5,7 +5,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x82000000 CONFIG_DEFAULT_DEVICE_TREE="openpiton-riscv64" -CONFIG_SYS_PROMPT="openpiton$ " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_LOAD_ADDR=0x87000000 CONFIG_TARGET_OPENPITON_RISCV64=y @@ -20,6 +19,7 @@ CONFIG_ENV_VARS_UBOOT_CONFIG=y # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="fdt addr ${fdtcontroladdr}; fdt move ${fdtcontroladdr} ${fdt_addr_r}; load mmc ${mmcdev}:${mmcpart} ${kernel_addr_r} ${image}; booti ${kernel_addr_r} - ${fdt_addr_r}; " +CONFIG_SYS_PROMPT="openpiton$ " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=284 # CONFIG_CMD_CPU is not set diff --git a/configs/openpiton_riscv64_spl_defconfig b/configs/openpiton_riscv64_spl_defconfig index b7696d7..9272bf6 100644 --- a/configs/openpiton_riscv64_spl_defconfig +++ b/configs/openpiton_riscv64_spl_defconfig @@ -5,7 +5,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x82000000 CONFIG_DEFAULT_DEVICE_TREE="openpiton-riscv64" -CONFIG_SYS_PROMPT="openpiton$ " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SPL_STACK=0x83fffe80 CONFIG_SPL_SYS_MALLOC_F_LEN=0x100000 @@ -36,6 +35,7 @@ CONFIG_SPL_CPU=y CONFIG_SPL_FS_EXT4=y CONFIG_SPL_FS_LOAD_PAYLOAD_NAME="boot/fw_payload.bin" CONFIG_SPL_RTC=y +CONFIG_SYS_PROMPT="openpiton$ " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=284 # CONFIG_CMD_CPU is not set diff --git a/configs/opos6uldev_defconfig b/configs/opos6uldev_defconfig index c4d738a..19d12c1 100644 --- a/configs/opos6uldev_defconfig +++ b/configs/opos6uldev_defconfig @@ -12,7 +12,6 @@ CONFIG_MX6UL=y CONFIG_TARGET_OPOS6ULDEV=y CONFIG_DEFAULT_DEVICE_TREE="imx6ul-opos6uldev" CONFIG_SPL_TEXT_BASE=0x00908000 -CONFIG_SYS_PROMPT="BIOS> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_MONITOR_LEN=409600 CONFIG_SPL_MMC=y @@ -39,6 +38,7 @@ CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_WATCHDOG=y CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="BIOS> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=535 CONFIG_CMD_CONFIG=y diff --git a/configs/origen_defconfig b/configs/origen_defconfig index fa6c9ae..4075ef2 100644 --- a/configs/origen_defconfig +++ b/configs/origen_defconfig @@ -15,7 +15,6 @@ CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_OFFSET=0x4200 CONFIG_DEFAULT_DEVICE_TREE="exynos4210-origen" CONFIG_SPL_TEXT_BASE=0x02021410 -CONFIG_SYS_PROMPT="ORIGEN # " CONFIG_SYS_MONITOR_LEN=262144 CONFIG_SPL=y CONFIG_IDENT_STRING=" for ORIGEN" @@ -28,6 +27,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_SPL_FRAMEWORK is not set CONFIG_SPL_FOOTPRINT_LIMIT=y CONFIG_SPL_MAX_FOOTPRINT=0x3800 +CONFIG_SYS_PROMPT="ORIGEN # " CONFIG_SYS_PBSIZE=1024 # CONFIG_CMD_XIMG is not set CONFIG_CMD_THOR_DOWNLOAD=y diff --git a/configs/p2371-0000_defconfig b/configs/p2371-0000_defconfig index dcfd3eb..188c236 100644 --- a/configs/p2371-0000_defconfig +++ b/configs/p2371-0000_defconfig @@ -8,13 +8,13 @@ CONFIG_SF_DEFAULT_SPEED=24000000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFFE000 CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2371-0000" -CONFIG_SYS_PROMPT="Tegra210 (P2371-0000) # " CONFIG_TEGRA210=y CONFIG_TEGRA_GPU=y CONFIG_SYS_LOAD_ADDR=0x80080000 CONFIG_OF_SYSTEM_SETUP=y CONFIG_CONSOLE_MUX=y CONFIG_SYS_STDIO_DEREGISTER=y +CONFIG_SYS_PROMPT="Tegra210 (P2371-0000) # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2089 CONFIG_SYS_BOOTM_LEN=0x800000 diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig index 7716655..027e1be 100644 --- a/configs/p2371-2180_defconfig +++ b/configs/p2371-2180_defconfig @@ -10,7 +10,6 @@ CONFIG_SF_DEFAULT_SPEED=24000000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFFE000 CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2371-2180" -CONFIG_SYS_PROMPT="Tegra210 (P2371-2180) # " CONFIG_TEGRA210=y CONFIG_TARGET_P2371_2180=y CONFIG_TEGRA_GPU=y @@ -20,6 +19,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_OF_SYSTEM_SETUP=y CONFIG_CONSOLE_MUX=y CONFIG_SYS_STDIO_DEREGISTER=y +CONFIG_SYS_PROMPT="Tegra210 (P2371-2180) # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2089 CONFIG_SYS_BOOTM_LEN=0x800000 diff --git a/configs/p2571_defconfig b/configs/p2571_defconfig index 7e2829e..dc955cc 100644 --- a/configs/p2571_defconfig +++ b/configs/p2571_defconfig @@ -8,7 +8,6 @@ CONFIG_SF_DEFAULT_SPEED=24000000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFFE000 CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2571" -CONFIG_SYS_PROMPT="Tegra210 (P2571) # " CONFIG_TEGRA210=y CONFIG_TARGET_P2571=y CONFIG_TEGRA_GPU=y @@ -16,6 +15,7 @@ CONFIG_SYS_LOAD_ADDR=0x80080000 CONFIG_OF_SYSTEM_SETUP=y CONFIG_CONSOLE_MUX=y CONFIG_SYS_STDIO_DEREGISTER=y +CONFIG_SYS_PROMPT="Tegra210 (P2571) # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2084 CONFIG_SYS_BOOTM_LEN=0x800000 diff --git a/configs/p2771-0000-000_defconfig b/configs/p2771-0000-000_defconfig index 3cdb1a7..a0fdbcc 100644 --- a/configs/p2771-0000-000_defconfig +++ b/configs/p2771-0000-000_defconfig @@ -8,7 +8,6 @@ CONFIG_NR_DRAM_BANKS=1026 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFFE000 CONFIG_DEFAULT_DEVICE_TREE="tegra186-p2771-0000-000" -CONFIG_SYS_PROMPT="Tegra186 (P2771-0000-000) # " CONFIG_TEGRA186=y CONFIG_SYS_LOAD_ADDR=0x80080000 CONFIG_PCI=y @@ -16,6 +15,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_OF_SYSTEM_SETUP=y CONFIG_CONSOLE_MUX=y CONFIG_SYS_STDIO_DEREGISTER=y +CONFIG_SYS_PROMPT="Tegra186 (P2771-0000-000) # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2093 CONFIG_SYS_BOOTM_LEN=0x800000 diff --git a/configs/p2771-0000-500_defconfig b/configs/p2771-0000-500_defconfig index 41a108d..0081d89 100644 --- a/configs/p2771-0000-500_defconfig +++ b/configs/p2771-0000-500_defconfig @@ -8,7 +8,6 @@ CONFIG_NR_DRAM_BANKS=1026 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFFE000 CONFIG_DEFAULT_DEVICE_TREE="tegra186-p2771-0000-500" -CONFIG_SYS_PROMPT="Tegra186 (P2771-0000-500) # " CONFIG_TEGRA186=y CONFIG_SYS_LOAD_ADDR=0x80080000 CONFIG_PCI=y @@ -16,6 +15,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_OF_SYSTEM_SETUP=y CONFIG_CONSOLE_MUX=y CONFIG_SYS_STDIO_DEREGISTER=y +CONFIG_SYS_PROMPT="Tegra186 (P2771-0000-500) # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2093 CONFIG_SYS_BOOTM_LEN=0x800000 diff --git a/configs/p3450-0000_defconfig b/configs/p3450-0000_defconfig index febd82e..aaaf7c9 100644 --- a/configs/p3450-0000_defconfig +++ b/configs/p3450-0000_defconfig @@ -11,7 +11,6 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFFE000 CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_DEFAULT_DEVICE_TREE="tegra210-p3450-0000" -CONFIG_SYS_PROMPT="Tegra210 (P3450-0000) # " CONFIG_TEGRA210=y CONFIG_TARGET_P3450_0000=y CONFIG_TEGRA_GPU=y @@ -21,6 +20,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_OF_SYSTEM_SETUP=y CONFIG_CONSOLE_MUX=y CONFIG_SYS_STDIO_DEREGISTER=y +CONFIG_SYS_PROMPT="Tegra210 (P3450-0000) # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2089 CONFIG_SYS_BOOTM_LEN=0x800000 diff --git a/configs/paz00_defconfig b/configs/paz00_defconfig index 8c125c3..ad65fa0 100644 --- a/configs/paz00_defconfig +++ b/configs/paz00_defconfig @@ -7,7 +7,6 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFFE000 CONFIG_DEFAULT_DEVICE_TREE="tegra20-paz00" CONFIG_SPL_TEXT_BASE=0x00108000 -CONFIG_SYS_PROMPT="Tegra20 (Paz00) MOD # " CONFIG_SPL_STACK=0xffffc CONFIG_TEGRA20=y CONFIG_TARGET_PAZ00=y @@ -21,6 +20,7 @@ CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x90000 CONFIG_SYS_SPL_MALLOC_SIZE=0x10000 +CONFIG_SYS_PROMPT="Tegra20 (Paz00) MOD # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2087 # CONFIG_CMD_IMI is not set diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig index 2b57f23..c863867 100644 --- a/configs/peach-pi_defconfig +++ b/configs/peach-pi_defconfig @@ -17,7 +17,6 @@ CONFIG_ENV_OFFSET=0x3FC000 CONFIG_ENV_SECT_SIZE=0x4000 CONFIG_DEFAULT_DEVICE_TREE="exynos5800-peach-pi" CONFIG_SPL_TEXT_BASE=0x02024410 -CONFIG_SYS_PROMPT="Peach-Pi # " CONFIG_SPL=y CONFIG_IDENT_STRING=" for Peach-Pi" CONFIG_SYS_LOAD_ADDR=0x23e00000 @@ -28,6 +27,7 @@ CONFIG_SILENT_CONSOLE=y # CONFIG_SPL_FRAMEWORK is not set CONFIG_SPL_FOOTPRINT_LIMIT=y CONFIG_SPL_MAX_FOOTPRINT=0x7800 +CONFIG_SYS_PROMPT="Peach-Pi # " CONFIG_SYS_PBSIZE=1024 CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig index d4118fe..7989310 100644 --- a/configs/peach-pit_defconfig +++ b/configs/peach-pit_defconfig @@ -16,7 +16,6 @@ CONFIG_ENV_OFFSET=0x3FC000 CONFIG_ENV_SECT_SIZE=0x4000 CONFIG_DEFAULT_DEVICE_TREE="exynos5420-peach-pit" CONFIG_SPL_TEXT_BASE=0x02024410 -CONFIG_SYS_PROMPT="Peach-Pit # " CONFIG_SPL=y CONFIG_IDENT_STRING=" for Peach-Pit" CONFIG_SYS_LOAD_ADDR=0x23e00000 @@ -27,6 +26,7 @@ CONFIG_SILENT_CONSOLE=y # CONFIG_SPL_FRAMEWORK is not set CONFIG_SPL_FOOTPRINT_LIMIT=y CONFIG_SPL_MAX_FOOTPRINT=0x7800 +CONFIG_SYS_PROMPT="Peach-Pit # " CONFIG_SYS_PBSIZE=1024 CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y diff --git a/configs/phycore-imx8mm_defconfig b/configs/phycore-imx8mm_defconfig index 4a27d15..3c22322 100644 --- a/configs/phycore-imx8mm_defconfig +++ b/configs/phycore-imx8mm_defconfig @@ -12,7 +12,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="phycore-imx8mm" CONFIG_SPL_TEXT_BASE=0x7E1000 CONFIG_TARGET_PHYCORE_IMX8MM=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -45,6 +44,7 @@ CONFIG_SPL_POWER=y CONFIG_SPL_SPI_FLASH_MTD=y CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074 diff --git a/configs/phycore-imx8mp_defconfig b/configs/phycore-imx8mp_defconfig index 7bf404b..af6945d 100644 --- a/configs/phycore-imx8mp_defconfig +++ b/configs/phycore-imx8mp_defconfig @@ -12,7 +12,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mp-phyboard-pollux-rdk" CONFIG_SPL_TEXT_BASE=0x920000 CONFIG_TARGET_PHYCORE_IMX8MP=y -CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -48,6 +47,7 @@ CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="u-boot=> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074 diff --git a/configs/pic32mzdask_defconfig b/configs/pic32mzdask_defconfig index 1e67f9e..8e93c03 100644 --- a/configs/pic32mzdask_defconfig +++ b/configs/pic32mzdask_defconfig @@ -7,7 +7,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x8007ffff CONFIG_ENV_SIZE=0x4000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="pic32mzda_sk" -CONFIG_SYS_PROMPT="dask # " CONFIG_SYS_MONITOR_LEN=196608 CONFIG_SYS_LOAD_ADDR=0x88500000 CONFIG_MACH_PIC32=y @@ -22,6 +21,7 @@ CONFIG_BOOTDELAY=5 CONFIG_BOOTCOMMAND="run distro_bootcmd || run legacy_bootcmd" CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_SYS_BOOTPARAMS_LEN=0x1000 +CONFIG_SYS_PROMPT="dask # " CONFIG_SYS_PBSIZE=1048 # CONFIG_CMD_SAVEENV is not set CONFIG_LOOPW=y diff --git a/configs/plutux_defconfig b/configs/plutux_defconfig index ab9aef5..568e15c 100644 --- a/configs/plutux_defconfig +++ b/configs/plutux_defconfig @@ -7,7 +7,6 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x1FFE0000 CONFIG_DEFAULT_DEVICE_TREE="tegra20-plutux" CONFIG_SPL_TEXT_BASE=0x00108000 -CONFIG_SYS_PROMPT="Tegra20 (Plutux) # " CONFIG_SPL_STACK=0xffffc CONFIG_TEGRA20=y CONFIG_TARGET_PLUTUX=y @@ -24,6 +23,7 @@ CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x90000 CONFIG_SYS_SPL_MALLOC_SIZE=0x10000 +CONFIG_SYS_PROMPT="Tegra20 (Plutux) # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2084 # CONFIG_CMD_IMI is not set diff --git a/configs/pm9261_defconfig b/configs/pm9261_defconfig index 4221c63..4126286 100644 --- a/configs/pm9261_defconfig +++ b/configs/pm9261_defconfig @@ -11,7 +11,6 @@ CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9261ek" -CONFIG_SYS_PROMPT="pm9261> " CONFIG_SYS_LOAD_ADDR=0x22000000 CONFIG_ENV_ADDR=0x10040000 CONFIG_BOOTDELAY=3 @@ -24,6 +23,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_CPUINFO is not set CONFIG_BOARD_EARLY_INIT_F=y # CONFIG_AUTO_COMPLETE is not set +CONFIG_SYS_PROMPT="pm9261> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/pm9263_defconfig b/configs/pm9263_defconfig index f8ad2fc..2a283e3 100644 --- a/configs/pm9263_defconfig +++ b/configs/pm9263_defconfig @@ -11,7 +11,6 @@ CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek" -CONFIG_SYS_PROMPT="u-boot-pm9263> " CONFIG_SYS_LOAD_ADDR=0x22000000 CONFIG_ENV_ADDR=0x10040000 CONFIG_BOOTDELAY=3 @@ -23,6 +22,7 @@ CONFIG_BOOTCOMMAND="run flashboot" CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_BOARD_EARLY_INIT_F=y # CONFIG_AUTO_COMPLETE is not set +CONFIG_SYS_PROMPT="u-boot-pm9263> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=288 # CONFIG_CMD_BDI is not set diff --git a/configs/pm9g45_defconfig b/configs/pm9g45_defconfig index b7223ed..3b2bf6c 100644 --- a/configs/pm9g45_defconfig +++ b/configs/pm9g45_defconfig @@ -10,7 +10,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x70003f00 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9m10g45ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_MONITOR_LEN=524288 CONFIG_DEBUG_UART_BASE=0xffffee00 CONFIG_DEBUG_UART_CLOCK=132000000 @@ -27,6 +26,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_RESET_PHY_R=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/pogo_e02_defconfig b/configs/pogo_e02_defconfig index 469752c..d653ee4 100644 --- a/configs/pogo_e02_defconfig +++ b/configs/pogo_e02_defconfig @@ -14,7 +14,6 @@ CONFIG_TARGET_POGO_E02=y CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0xC0000 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-pogo_e02" -CONFIG_SYS_PROMPT="PogoE02> " CONFIG_IDENT_STRING="\nPogo E02" CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_BOOTDELAY=3 @@ -22,6 +21,7 @@ CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs $(bootargs_console); run bootcmd_usb; bootm 0x00800000 0x01100000" CONFIG_USE_PREBOOT=y # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_PROMPT="PogoE02> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=1050 # CONFIG_CMD_FLASH is not set diff --git a/configs/pogo_v4_defconfig b/configs/pogo_v4_defconfig index 3e3e811..cbbade3 100644 --- a/configs/pogo_v4_defconfig +++ b/configs/pogo_v4_defconfig @@ -13,7 +13,6 @@ CONFIG_TARGET_POGO_V4=y CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0xC0000 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-pogoplug-series-4" -CONFIG_SYS_PROMPT="Pogo_V4> " CONFIG_IDENT_STRING="\nPogoplug V4" CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_PCI=y @@ -23,6 +22,7 @@ CONFIG_SHOW_BOOT_PROGRESS=y CONFIG_BOOTDELAY=10 CONFIG_USE_PREBOOT=y CONFIG_BOARD_LATE_INIT=y +CONFIG_SYS_PROMPT="Pogo_V4> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=1050 # CONFIG_BOOTM_PLAN9 is not set diff --git a/configs/poleg_evb_defconfig b/configs/poleg_evb_defconfig index 1eb3396..29b1297 100644 --- a/configs/poleg_evb_defconfig +++ b/configs/poleg_evb_defconfig @@ -13,7 +13,6 @@ CONFIG_ENV_OFFSET=0x100000 CONFIG_ENV_SECT_SIZE=0x4000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="nuvoton-npcm750-evb" -CONFIG_SYS_PROMPT="U-Boot>" CONFIG_DM_RESET=y CONFIG_TARGET_POLEG=y CONFIG_SYS_LOAD_ADDR=0x10000000 @@ -21,6 +20,7 @@ CONFIG_ENV_ADDR=0x80100000 CONFIG_FIT=y CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="run common_bootargs; run romboot" +CONFIG_SYS_PROMPT="U-Boot>" CONFIG_SYS_MAXARGS=32 CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=280 diff --git a/configs/pomelo_defconfig b/configs/pomelo_defconfig index 3b3fe59..be0f768 100644 --- a/configs/pomelo_defconfig +++ b/configs/pomelo_defconfig @@ -7,7 +7,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x2981a000 CONFIG_DEFAULT_DEVICE_TREE="phytium-pomelo" -CONFIG_SYS_PROMPT="pomelo#" CONFIG_SYS_LOAD_ADDR=0x90000000 CONFIG_SYS_PCI_64BIT=y CONFIG_DISTRO_DEFAULTS=y @@ -16,6 +15,7 @@ CONFIG_BOOTARGS="console=ttyAMA0,115200 earlycon=pl011,0x28001000 root=/dev/sda2 # CONFIG_DISPLAY_CPUINFO is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_LAST_STAGE_INIT=y +CONFIG_SYS_PROMPT="pomelo#" CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=280 CONFIG_SYS_BOOTM_LEN=0x3c00000 diff --git a/configs/poplar_defconfig b/configs/poplar_defconfig index c7f2a6c..f0ab231 100644 --- a/configs/poplar_defconfig +++ b/configs/poplar_defconfig @@ -9,11 +9,11 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x200000 CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0x1F0000 CONFIG_DEFAULT_DEVICE_TREE="hi3798cv200-poplar" -CONFIG_SYS_PROMPT="poplar# " CONFIG_IDENT_STRING="poplar" CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_DISTRO_DEFAULTS=y # CONFIG_DISPLAY_CPUINFO is not set +CONFIG_SYS_PROMPT="poplar# " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=537 diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig index 88a6dbd..a426bf1 100644 --- a/configs/pxm2_defconfig +++ b/configs/pxm2_defconfig @@ -13,7 +13,6 @@ CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="am335x-pxm50" CONFIG_AM33XX=y CONFIG_SYS_MPUCLK=720 -CONFIG_SYS_PROMPT="U-Boot# " CONFIG_TARGET_PXM2=y CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -51,6 +50,7 @@ CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000 CONFIG_SPL_WATCHDOG=y CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot# " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=1049 CONFIG_CMD_ASKENV=y diff --git a/configs/r8a77970_eagle_defconfig b/configs/r8a77970_eagle_defconfig index 56d62bc..4d40dbf 100644 --- a/configs/r8a77970_eagle_defconfig +++ b/configs/r8a77970_eagle_defconfig @@ -71,6 +71,7 @@ CONFIG_BITBANGMII=y CONFIG_BITBANGMII_MULTI=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_DM_ETH_PHY=y CONFIG_RENESAS_RAVB=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y diff --git a/configs/r8a77970_v3msk_defconfig b/configs/r8a77970_v3msk_defconfig index e26607a..61e2618 100644 --- a/configs/r8a77970_v3msk_defconfig +++ b/configs/r8a77970_v3msk_defconfig @@ -76,6 +76,7 @@ CONFIG_BITBANGMII=y CONFIG_BITBANGMII_MULTI=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_DM_ETH_PHY=y CONFIG_RENESAS_RAVB=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y diff --git a/configs/r8a77980_condor_defconfig b/configs/r8a77980_condor_defconfig index 57df450..b73129f 100644 --- a/configs/r8a77980_condor_defconfig +++ b/configs/r8a77980_condor_defconfig @@ -79,6 +79,7 @@ CONFIG_BITBANGMII=y CONFIG_BITBANGMII_MULTI=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_DM_ETH_PHY=y CONFIG_SH_ETHER=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y diff --git a/configs/r8a77980_v3hsk_defconfig b/configs/r8a77980_v3hsk_defconfig index 0025c04..f48ed6c 100644 --- a/configs/r8a77980_v3hsk_defconfig +++ b/configs/r8a77980_v3hsk_defconfig @@ -72,6 +72,7 @@ CONFIG_BITBANGMII=y CONFIG_BITBANGMII_MULTI=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_DM_ETH_PHY=y CONFIG_SH_ETHER=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y diff --git a/configs/r8a77990_ebisu_defconfig b/configs/r8a77990_ebisu_defconfig index 95eb911..55bc303 100644 --- a/configs/r8a77990_ebisu_defconfig +++ b/configs/r8a77990_ebisu_defconfig @@ -93,6 +93,7 @@ CONFIG_BITBANGMII=y CONFIG_BITBANGMII_MULTI=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_DM_ETH_PHY=y CONFIG_RENESAS_RAVB=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y diff --git a/configs/r8a77995_draak_defconfig b/configs/r8a77995_draak_defconfig index 4b67971..1c1b725 100644 --- a/configs/r8a77995_draak_defconfig +++ b/configs/r8a77995_draak_defconfig @@ -90,6 +90,7 @@ CONFIG_BITBANGMII=y CONFIG_BITBANGMII_MULTI=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_DM_ETH_PHY=y CONFIG_RENESAS_RAVB=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y diff --git a/configs/r8a779a0_falcon_defconfig b/configs/r8a779a0_falcon_defconfig index 5350447..93f1055 100644 --- a/configs/r8a779a0_falcon_defconfig +++ b/configs/r8a779a0_falcon_defconfig @@ -65,6 +65,7 @@ CONFIG_BITBANGMII=y CONFIG_BITBANGMII_MULTI=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_DM_ETH_PHY=y CONFIG_RENESAS_RAVB=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y diff --git a/configs/r8a779g0_whitehawk_defconfig b/configs/r8a779g0_whitehawk_defconfig index 4547154..1d0805c 100644 --- a/configs/r8a779g0_whitehawk_defconfig +++ b/configs/r8a779g0_whitehawk_defconfig @@ -63,6 +63,7 @@ CONFIG_BITBANGMII=y CONFIG_BITBANGMII_MULTI=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_DM_ETH_PHY=y CONFIG_RENESAS_RAVB=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig index 7e4580f..7df30f8 100644 --- a/configs/rastaban_defconfig +++ b/configs/rastaban_defconfig @@ -13,7 +13,6 @@ CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="am335x-draco" CONFIG_AM33XX=y CONFIG_SYS_MPUCLK=300 -CONFIG_SYS_PROMPT="U-Boot# " CONFIG_TARGET_RASTABAN=y CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -52,6 +51,7 @@ CONFIG_SPL_WATCHDOG=y CONFIG_SPL_YMODEM_SUPPORT=y # CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC is not set CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot# " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=1049 CONFIG_CMD_ASKENV=y diff --git a/configs/rcar3_salvator-x_defconfig b/configs/rcar3_salvator-x_defconfig index 8de39c6..6aaf24e 100644 --- a/configs/rcar3_salvator-x_defconfig +++ b/configs/rcar3_salvator-x_defconfig @@ -97,6 +97,7 @@ CONFIG_BITBANGMII=y CONFIG_BITBANGMII_MULTI=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_DM_ETH_PHY=y CONFIG_RENESAS_RAVB=y CONFIG_NVME_PCI=y CONFIG_PCI_REGION_MULTI_ENTRY=y diff --git a/configs/rcar3_ulcb_defconfig b/configs/rcar3_ulcb_defconfig index b8fdb5e..489e710 100644 --- a/configs/rcar3_ulcb_defconfig +++ b/configs/rcar3_ulcb_defconfig @@ -94,6 +94,7 @@ CONFIG_BITBANGMII=y CONFIG_BITBANGMII_MULTI=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_DM_ETH_PHY=y CONFIG_RENESAS_RAVB=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y diff --git a/configs/rock64-rk3328_defconfig b/configs/rock64-rk3328_defconfig index c2641f6..0297d09 100644 --- a/configs/rock64-rk3328_defconfig +++ b/configs/rock64-rk3328_defconfig @@ -75,8 +75,6 @@ CONFIG_MISC=y CONFIG_ROCKCHIP_EFUSE=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y -CONFIG_DM_RNG=y -CONFIG_RNG_ROCKCHIP=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y @@ -95,6 +93,8 @@ CONFIG_PWM_ROCKCHIP=y CONFIG_RAM=y CONFIG_SPL_RAM=y CONFIG_TPL_RAM=y +CONFIG_DM_RNG=y +CONFIG_RNG_ROCKCHIP=y CONFIG_BAUDRATE=1500000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550_MEM32=y diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig index 4e048b6..fee10c4 100644 --- a/configs/rock960-rk3399_defconfig +++ b/configs/rock960-rk3399_defconfig @@ -7,7 +7,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock960" -CONFIG_SYS_PROMPT="rock960 => " CONFIG_DM_RESET=y CONFIG_ROCKCHIP_RK3399=y CONFIG_TARGET_ROCK960_RK3399=y @@ -32,6 +31,7 @@ CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y CONFIG_TPL=y +CONFIG_SYS_PROMPT="rock960 => " CONFIG_SYS_PBSIZE=1052 CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPT=y diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig index 3167bfb..ab6e6bc 100644 --- a/configs/rpi_0_w_defconfig +++ b/configs/rpi_0_w_defconfig @@ -9,7 +9,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x7ffff00 CONFIG_ENV_SIZE=0x4000 CONFIG_DEFAULT_DEVICE_TREE="bcm2835-rpi-zero-w" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_LOAD_ADDR=0x1000000 CONFIG_BOOTSTD_DEFAULTS=y @@ -19,6 +18,7 @@ CONFIG_USE_PREBOOT=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_MISC_INIT_R=y CONFIG_FDT_SIMPLEFB=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_PBSIZE=1049 CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig index 883dab1..0dea092 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig @@ -10,7 +10,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x7ffff00 CONFIG_ENV_SIZE=0x4000 CONFIG_DEFAULT_DEVICE_TREE="bcm2836-rpi-2-b" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_LOAD_ADDR=0x1000000 CONFIG_BOOTSTD_DEFAULTS=y @@ -20,6 +19,7 @@ CONFIG_USE_PREBOOT=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_MISC_INIT_R=y CONFIG_FDT_SIMPLEFB=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_PBSIZE=1049 CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig index 5ff7d98..0ccc93d 100644 --- a/configs/rpi_3_32b_defconfig +++ b/configs/rpi_3_32b_defconfig @@ -9,7 +9,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x7ffff00 CONFIG_ENV_SIZE=0x4000 CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_LOAD_ADDR=0x1000000 CONFIG_BOOTSTD_DEFAULTS=y @@ -19,6 +18,7 @@ CONFIG_USE_PREBOOT=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_MISC_INIT_R=y CONFIG_FDT_SIMPLEFB=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_PBSIZE=1049 CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y diff --git a/configs/rpi_3_b_plus_defconfig b/configs/rpi_3_b_plus_defconfig index 31f2a6e..53f7f31 100644 --- a/configs/rpi_3_b_plus_defconfig +++ b/configs/rpi_3_b_plus_defconfig @@ -8,7 +8,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x7fffe40 CONFIG_ENV_SIZE=0x4000 CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b-plus" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_LOAD_ADDR=0x1000000 CONFIG_BOOTSTD_DEFAULTS=y @@ -18,6 +17,7 @@ CONFIG_USE_PREBOOT=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_MISC_INIT_R=y CONFIG_FDT_SIMPLEFB=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_PBSIZE=1049 CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig index fa6e150..84b61f8 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig @@ -8,7 +8,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x7fffe40 CONFIG_ENV_SIZE=0x4000 CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_LOAD_ADDR=0x1000000 CONFIG_BOOTSTD_DEFAULTS=y @@ -18,6 +17,7 @@ CONFIG_USE_PREBOOT=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_MISC_INIT_R=y CONFIG_FDT_SIMPLEFB=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_PBSIZE=1049 CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig index 55bf6c0..766c983 100644 --- a/configs/rpi_4_32b_defconfig +++ b/configs/rpi_4_32b_defconfig @@ -6,12 +6,11 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x7fffee0 CONFIG_ENV_SIZE=0x4000 CONFIG_DEFAULT_DEVICE_TREE="bcm2711-rpi-4-b" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_SYS_LOAD_ADDR=0x1000000 -CONFIG_BOOTSTD_DEFAULTS=y CONFIG_PCI=y +CONFIG_BOOTSTD_DEFAULTS=y CONFIG_OF_BOARD_SETUP=y CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="pci enum; usb start;" @@ -19,6 +18,7 @@ CONFIG_PREBOOT="pci enum; usb start;" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_MISC_INIT_R=y CONFIG_FDT_SIMPLEFB=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_PBSIZE=1049 CONFIG_CMD_DFU=y CONFIG_CMD_GPIO=y diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig index 6679cce..553d47b 100644 --- a/configs/rpi_4_defconfig +++ b/configs/rpi_4_defconfig @@ -6,12 +6,11 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x7fffe30 CONFIG_ENV_SIZE=0x4000 CONFIG_DEFAULT_DEVICE_TREE="bcm2711-rpi-4-b" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_SYS_LOAD_ADDR=0x1000000 -CONFIG_BOOTSTD_DEFAULTS=y CONFIG_PCI=y +CONFIG_BOOTSTD_DEFAULTS=y CONFIG_OF_BOARD_SETUP=y CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="pci enum; usb start;" @@ -19,6 +18,7 @@ CONFIG_PREBOOT="pci enum; usb start;" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_MISC_INIT_R=y CONFIG_FDT_SIMPLEFB=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_PBSIZE=1049 CONFIG_CMD_DFU=y CONFIG_CMD_GPIO=y diff --git a/configs/rpi_arm64_defconfig b/configs/rpi_arm64_defconfig index 26e29ff..7ff166a 100644 --- a/configs/rpi_arm64_defconfig +++ b/configs/rpi_arm64_defconfig @@ -6,12 +6,11 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x7fffe30 CONFIG_ENV_SIZE=0x4000 CONFIG_DEFAULT_DEVICE_TREE="bcm2711-rpi-4-b" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_SYS_LOAD_ADDR=0x1000000 -CONFIG_BOOTSTD_DEFAULTS=y CONFIG_PCI=y +CONFIG_BOOTSTD_DEFAULTS=y CONFIG_OF_BOARD_SETUP=y CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="pci enum; usb start;" @@ -19,6 +18,7 @@ CONFIG_PREBOOT="pci enum; usb start;" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_MISC_INIT_R=y CONFIG_FDT_SIMPLEFB=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_PBSIZE=1049 CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig index 0ac5efe..d049d0f 100644 --- a/configs/rpi_defconfig +++ b/configs/rpi_defconfig @@ -9,7 +9,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x7ffff00 CONFIG_ENV_SIZE=0x4000 CONFIG_DEFAULT_DEVICE_TREE="bcm2835-rpi-b" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_LOAD_ADDR=0x1000000 CONFIG_BOOTSTD_DEFAULTS=y @@ -19,6 +18,7 @@ CONFIG_USE_PREBOOT=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_MISC_INIT_R=y CONFIG_FDT_SIMPLEFB=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_PBSIZE=1049 CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y diff --git a/configs/rut_defconfig b/configs/rut_defconfig index ba89b4d..b4a78f5 100644 --- a/configs/rut_defconfig +++ b/configs/rut_defconfig @@ -13,7 +13,6 @@ CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="am335x-rut" CONFIG_AM33XX=y CONFIG_SYS_MPUCLK=600 -CONFIG_SYS_PROMPT="U-Boot# " CONFIG_TARGET_RUT=y CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -51,6 +50,7 @@ CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000 CONFIG_SPL_WATCHDOG=y CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot# " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=1049 CONFIG_CMD_ASKENV=y diff --git a/configs/s5p4418_nanopi2_defconfig b/configs/s5p4418_nanopi2_defconfig index 5356161..e058b67 100644 --- a/configs/s5p4418_nanopi2_defconfig +++ b/configs/s5p4418_nanopi2_defconfig @@ -12,7 +12,6 @@ CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_OFFSET=0x2E0200 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="s5p4418-nanopi2" -CONFIG_SYS_PROMPT="nanopi2# " CONFIG_DEBUG_UART_BASE=0xC00A1000 CONFIG_DEBUG_UART_CLOCK=150000000 CONFIG_TARGET_NANOPI2=y @@ -31,6 +30,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=1 CONFIG_BOARD_LATE_INIT=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="nanopi2# " CONFIG_SYS_PBSIZE=1050 CONFIG_CMD_BOOTZ=y # CONFIG_BOOTM_NETBSD is not set diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig index dd5e24c..80a7f6b 100644 --- a/configs/s5p_goni_defconfig +++ b/configs/s5p_goni_defconfig @@ -10,7 +10,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x33000000 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x7000 CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-goni" -CONFIG_SYS_PROMPT="Goni # " CONFIG_SYS_MONITOR_LEN=262144 CONFIG_TARGET_S5P_GONI=y CONFIG_SYS_LOAD_ADDR=0x34000000 @@ -24,6 +23,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_MISC_INIT_R=y CONFIG_HUSH_PARSER=y # CONFIG_AUTO_COMPLETE is not set +CONFIG_SYS_PROMPT="Goni # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=384 # CONFIG_CMD_XIMG is not set diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig index 1bcdc84..d14a589 100644 --- a/configs/s5pc210_universal_defconfig +++ b/configs/s5pc210_universal_defconfig @@ -14,7 +14,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x447fff10 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x7000 CONFIG_DEFAULT_DEVICE_TREE="exynos4210-universal_c210" -CONFIG_SYS_PROMPT="Universal # " CONFIG_SYS_MONITOR_LEN=262144 CONFIG_SYS_MEM_TOP_HIDE=0x100000 CONFIG_SYS_LOAD_ADDR=0x44800000 @@ -25,6 +24,7 @@ CONFIG_BOOTCOMMAND="run mmcboot" CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_MISC_INIT_R=y +CONFIG_SYS_PROMPT="Universal # " CONFIG_SYS_PBSIZE=1024 # CONFIG_CMD_XIMG is not set CONFIG_CMD_THOR_DOWNLOAD=y diff --git a/configs/sagem_f@st1704_ram_defconfig b/configs/sagem_f@st1704_ram_defconfig index f8712dd..789cd17 100644 --- a/configs/sagem_f@st1704_ram_defconfig +++ b/configs/sagem_f@st1704_ram_defconfig @@ -5,7 +5,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="sagem,f@st1704" -CONFIG_SYS_PROMPT="F@ST1704 # " CONFIG_DM_RESET=y CONFIG_SYS_LOAD_ADDR=0x80100000 CONFIG_ARCH_BMIPS=y @@ -21,6 +20,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DISPLAY_CPUINFO=y CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="F@ST1704 # " CONFIG_SYS_MAXARGS=24 CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=540 diff --git a/configs/sam9x60_curiosity_mmc1_defconfig b/configs/sam9x60_curiosity_mmc1_defconfig index bb5e7d8..a2453701 100644 --- a/configs/sam9x60_curiosity_mmc1_defconfig +++ b/configs/sam9x60_curiosity_mmc1_defconfig @@ -12,7 +12,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x2000bf00 CONFIG_ENV_SIZE=0x4000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91-sam9x60_curiosity" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_DEBUG_UART_BASE=0xfffff200 @@ -31,6 +30,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_MISC_INIT_R=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 CONFIG_CMD_BOOTZ=y diff --git a/configs/sam9x60_curiosity_mmc_defconfig b/configs/sam9x60_curiosity_mmc_defconfig index a0f819c..38ec241 100644 --- a/configs/sam9x60_curiosity_mmc_defconfig +++ b/configs/sam9x60_curiosity_mmc_defconfig @@ -12,7 +12,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x2000bf00 CONFIG_ENV_SIZE=0x4000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91-sam9x60_curiosity" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_DEBUG_UART_BASE=0xfffff200 @@ -31,6 +30,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_MISC_INIT_R=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 CONFIG_CMD_BOOTZ=y diff --git a/configs/sam9x60ek_mmc_defconfig b/configs/sam9x60ek_mmc_defconfig index c70c41c..7cb4ab1 100644 --- a/configs/sam9x60ek_mmc_defconfig +++ b/configs/sam9x60ek_mmc_defconfig @@ -13,7 +13,6 @@ CONFIG_SF_DEFAULT_SPEED=50000000 CONFIG_ENV_SIZE=0x4000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="sam9x60ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_DEBUG_UART_BASE=0xfffff200 @@ -32,6 +31,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_MISC_INIT_R=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 CONFIG_CMD_BOOTZ=y diff --git a/configs/sam9x60ek_nandflash_defconfig b/configs/sam9x60ek_nandflash_defconfig index 569b4e7..4bfd0e8 100644 --- a/configs/sam9x60ek_nandflash_defconfig +++ b/configs/sam9x60ek_nandflash_defconfig @@ -12,7 +12,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x2000bf00 CONFIG_SF_DEFAULT_SPEED=50000000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="sam9x60ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_DEBUG_UART_BASE=0xfffff200 @@ -32,6 +31,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_MISC_INIT_R=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 CONFIG_CMD_BOOTZ=y diff --git a/configs/sam9x60ek_qspiflash_defconfig b/configs/sam9x60ek_qspiflash_defconfig index 135cd78..c7224da 100644 --- a/configs/sam9x60ek_qspiflash_defconfig +++ b/configs/sam9x60ek_qspiflash_defconfig @@ -12,7 +12,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x2000bf00 CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="sam9x60ek" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_DEBUG_UART_BASE=0xfffff200 @@ -32,6 +31,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_MISC_INIT_R=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 CONFIG_CMD_BOOTZ=y diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig index fd110d9..5e199da 100644 --- a/configs/sandbox64_defconfig +++ b/configs/sandbox64_defconfig @@ -110,7 +110,6 @@ CONFIG_IPV6=y CONFIG_DM_DMA=y CONFIG_REGMAP=y CONFIG_SYSCON=y -CONFIG_DEVRES=y CONFIG_DEBUG_DEVRES=y CONFIG_ADC=y CONFIG_ADC_SANDBOX=y @@ -138,6 +137,7 @@ CONFIG_DM_DEMO_SHAPE=y CONFIG_DFU_SF=y CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=0 +CONFIG_ARM_FFA_TRANSPORT=y CONFIG_GPIO_HOG=y CONFIG_DM_GPIO_LOOKUP_LABEL=y CONFIG_QCOM_PMIC_GPIO=y @@ -271,4 +271,3 @@ CONFIG_FWU_MULTI_BANK_UPDATE=y CONFIG_UNIT_TEST=y CONFIG_UT_TIME=y CONFIG_UT_DM=y -CONFIG_ARM_FFA_TRANSPORT=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index d667cb9..6144787 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -144,7 +144,6 @@ CONFIG_IP_DEFRAG=y CONFIG_BOOTP_SERVERIP=y CONFIG_IPV6=y CONFIG_DM_DMA=y -CONFIG_DEVRES=y CONFIG_DEBUG_DEVRES=y CONFIG_SIMPLE_PM_BUS=y CONFIG_ADC=y @@ -183,6 +182,7 @@ CONFIG_DMA_CHANNELS=y CONFIG_SANDBOX_DMA=y CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=0 +CONFIG_ARM_FFA_TRANSPORT=y CONFIG_GPIO_HOG=y CONFIG_DM_GPIO_LOOKUP_LABEL=y CONFIG_QCOM_PMIC_GPIO=y @@ -348,4 +348,3 @@ CONFIG_TEST_FDTDEC=y CONFIG_UNIT_TEST=y CONFIG_UT_TIME=y CONFIG_UT_DM=y -CONFIG_ARM_FFA_TRANSPORT=y diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig index f8759f2..4fdc46f 100644 --- a/configs/seaboard_defconfig +++ b/configs/seaboard_defconfig @@ -7,7 +7,6 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFFE000 CONFIG_DEFAULT_DEVICE_TREE="tegra20-seaboard" CONFIG_SPL_TEXT_BASE=0x00108000 -CONFIG_SYS_PROMPT="Tegra20 (SeaBoard) # " CONFIG_SPL_STACK=0xffffc CONFIG_TEGRA20=y CONFIG_TARGET_SEABOARD=y @@ -22,6 +21,7 @@ CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x90000 CONFIG_SYS_SPL_MALLOC_SIZE=0x10000 +CONFIG_SYS_PROMPT="Tegra20 (SeaBoard) # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2086 # CONFIG_CMD_IMI is not set diff --git a/configs/sfr_nb4-ser_ram_defconfig b/configs/sfr_nb4-ser_ram_defconfig index f2b708b..74ebf6c 100644 --- a/configs/sfr_nb4-ser_ram_defconfig +++ b/configs/sfr_nb4-ser_ram_defconfig @@ -5,7 +5,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="sfr,nb4-ser" -CONFIG_SYS_PROMPT="NB4-SER # " CONFIG_DM_RESET=y CONFIG_SYS_LOAD_ADDR=0x80100000 CONFIG_ARCH_BMIPS=y @@ -23,6 +22,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_DISPLAY_CPUINFO=y CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="NB4-SER # " CONFIG_SYS_MAXARGS=24 CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=539 diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig index 836e0c0..29153de 100644 --- a/configs/smartweb_defconfig +++ b/configs/smartweb_defconfig @@ -18,7 +18,6 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x100000 CONFIG_DEFAULT_DEVICE_TREE="at91sam9260-smartweb" -CONFIG_SYS_PROMPT="U-Boot# " CONFIG_SPL_STACK=0x301000 CONFIG_SPL_SYS_MALLOC_F_LEN=0x400 CONFIG_SPL=y @@ -50,6 +49,7 @@ CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_SOFTECC=y CONFIG_SPL_NAND_BASE=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot# " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=537 diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig index a349b3d..a4a071d 100644 --- a/configs/smdk5250_defconfig +++ b/configs/smdk5250_defconfig @@ -19,7 +19,6 @@ CONFIG_ENV_OFFSET=0x3FC000 CONFIG_ENV_SECT_SIZE=0x4000 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-smdk5250" CONFIG_SPL_TEXT_BASE=0x02023400 -CONFIG_SYS_PROMPT="SMDK5250 # " CONFIG_SPL=y CONFIG_IDENT_STRING=" for SMDK5250" CONFIG_SYS_LOAD_ADDR=0x43e00000 @@ -31,6 +30,7 @@ CONFIG_CONSOLE_MUX=y # CONFIG_SPL_FRAMEWORK is not set CONFIG_SPL_FOOTPRINT_LIMIT=y CONFIG_SPL_MAX_FOOTPRINT=0x3800 +CONFIG_SYS_PROMPT="SMDK5250 # " CONFIG_SYS_PBSIZE=1024 CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig index da66c5f..f5907f9 100644 --- a/configs/smdk5420_defconfig +++ b/configs/smdk5420_defconfig @@ -17,7 +17,6 @@ CONFIG_ENV_OFFSET=0x3FC000 CONFIG_ENV_SECT_SIZE=0x4000 CONFIG_DEFAULT_DEVICE_TREE="exynos5420-smdk5420" CONFIG_SPL_TEXT_BASE=0x02024410 -CONFIG_SYS_PROMPT="SMDK5420 # " CONFIG_SPL=y CONFIG_IDENT_STRING=" for SMDK5420" CONFIG_SYS_LOAD_ADDR=0x23e00000 @@ -29,6 +28,7 @@ CONFIG_CONSOLE_MUX=y # CONFIG_SPL_FRAMEWORK is not set CONFIG_SPL_FOOTPRINT_LIMIT=y CONFIG_SPL_MAX_FOOTPRINT=0x7800 +CONFIG_SYS_PROMPT="SMDK5420 # " CONFIG_SYS_PBSIZE=1024 CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y diff --git a/configs/smdkc100_defconfig b/configs/smdkc100_defconfig index 989564b..dbd82f0 100644 --- a/configs/smdkc100_defconfig +++ b/configs/smdkc100_defconfig @@ -9,7 +9,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x2f000000 CONFIG_ENV_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-smdkc100" -CONFIG_SYS_PROMPT="SMDKC100 # " CONFIG_SYS_MONITOR_LEN=262144 CONFIG_TARGET_SMDKC100=y CONFIG_IDENT_STRING=" for SMDKC100" @@ -23,6 +22,7 @@ CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="run ubifsboot" CONFIG_HUSH_PARSER=y # CONFIG_AUTO_COMPLETE is not set +CONFIG_SYS_PROMPT="SMDKC100 # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=384 # CONFIG_CMD_FLASH is not set diff --git a/configs/smdkv310_defconfig b/configs/smdkv310_defconfig index 2f466d2..cf73f90 100644 --- a/configs/smdkv310_defconfig +++ b/configs/smdkv310_defconfig @@ -13,7 +13,6 @@ CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_OFFSET=0x4200 CONFIG_DEFAULT_DEVICE_TREE="exynos4210-smdkv310" CONFIG_SPL_TEXT_BASE=0x02021410 -CONFIG_SYS_PROMPT="SMDKV310 # " CONFIG_SYS_MONITOR_LEN=262144 CONFIG_SPL=y CONFIG_IDENT_STRING=" for SMDKC210/V310" @@ -23,6 +22,7 @@ CONFIG_BOOTCOMMAND="fatload mmc 0 40007000 uImage; bootm 40007000" # CONFIG_SPL_FRAMEWORK is not set CONFIG_SPL_FOOTPRINT_LIMIT=y CONFIG_SPL_MAX_FOOTPRINT=0x3800 +CONFIG_SYS_PROMPT="SMDKV310 # " CONFIG_SYS_PBSIZE=1024 # CONFIG_CMD_XIMG is not set CONFIG_CMD_GPT=y diff --git a/configs/smegw01_defconfig b/configs/smegw01_defconfig index 7f1b2be..5cfd3d2 100644 --- a/configs/smegw01_defconfig +++ b/configs/smegw01_defconfig @@ -7,13 +7,13 @@ CONFIG_ENV_OFFSET=0x100000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx7d-smegw01" CONFIG_TARGET_SMEGW01=y -# CONFIG_SYS_BOOT_LOCKED is not set CONFIG_ENV_OFFSET_REDUND=0x110000 CONFIG_ARMV7_BOOT_SEC_DEFAULT=y # CONFIG_ARMV7_VIRT is not set CONFIG_IMX_RDC=y CONFIG_IMX_BOOTAUX=y CONFIG_IMX_HAB=y +CONFIG_SYS_LOAD_ADDR=0x88000000 CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0xa0000000 CONFIG_FIT=y @@ -54,6 +54,8 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_ENV_WRITEABLE_LIST=y CONFIG_ENV_ACCESS_IGNORE_FORCE=y +CONFIG_USE_BOOTFILE=y +CONFIG_BOOTFILE="boot/fitImage" CONFIG_NET_RANDOM_ETHADDR=y CONFIG_BOUNCE_BUFFER=y CONFIG_BOOTCOUNT_LIMIT=y diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig index c762d75..02b9271 100644 --- a/configs/sniper_defconfig +++ b/configs/sniper_defconfig @@ -9,7 +9,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x4020ff00 CONFIG_SPL_TEXT_BASE=0x40200000 CONFIG_TARGET_SNIPER=y -CONFIG_SYS_PROMPT="sniper # " CONFIG_SPL_STACK=0x4020fffc CONFIG_SPL=y CONFIG_DISTRO_DEFAULTS=y @@ -26,6 +25,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=2 # CONFIG_SPL_FS_EXT4 is not set # CONFIG_SPL_NAND_SUPPORT is not set +CONFIG_SYS_PROMPT="sniper # " CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=538 CONFIG_CMD_GPIO=y diff --git a/configs/snow_defconfig b/configs/snow_defconfig index 22ec8e5..32195cf 100644 --- a/configs/snow_defconfig +++ b/configs/snow_defconfig @@ -19,7 +19,6 @@ CONFIG_ENV_OFFSET=0x3FC000 CONFIG_ENV_SECT_SIZE=0x4000 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-snow" CONFIG_SPL_TEXT_BASE=0x02023400 -CONFIG_SYS_PROMPT="snow # " CONFIG_SPL=y CONFIG_DEBUG_UART_BASE=0x12c30000 CONFIG_DEBUG_UART_CLOCK=100000000 @@ -38,6 +37,7 @@ CONFIG_BLOBLIST_ADDR=0x43d00000 # CONFIG_SPL_FRAMEWORK is not set CONFIG_SPL_FOOTPRINT_LIMIT=y CONFIG_SPL_MAX_FOOTPRINT=0x3800 +CONFIG_SYS_PROMPT="snow # " CONFIG_SYS_PBSIZE=1024 CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y diff --git a/configs/socfpga_agilex_atf_defconfig b/configs/socfpga_agilex_atf_defconfig index ba0dbb8..2377885 100644 --- a/configs/socfpga_agilex_atf_defconfig +++ b/configs/socfpga_agilex_atf_defconfig @@ -13,7 +13,6 @@ CONFIG_ENV_OFFSET=0x200 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_agilex_socdk" CONFIG_SPL_TEXT_BASE=0xFFE00000 -CONFIG_SYS_PROMPT="SOCFPGA_AGILEX # " CONFIG_DM_RESET=y CONFIG_SPL_STACK=0xffe3f000 CONFIG_TARGET_SOCFPGA_AGILEX_SOCDK=y @@ -46,6 +45,7 @@ CONFIG_SPL_ATF=y CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y CONFIG_SPL_TARGET="spl/u-boot-spl-dtb.hex" CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="SOCFPGA_AGILEX # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2082 CONFIG_SYS_BOOTM_LEN=0x2000000 diff --git a/configs/socfpga_agilex_defconfig b/configs/socfpga_agilex_defconfig index 406fe71..8ec32ab 100644 --- a/configs/socfpga_agilex_defconfig +++ b/configs/socfpga_agilex_defconfig @@ -12,7 +12,6 @@ CONFIG_ENV_OFFSET=0x200 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_agilex_socdk" CONFIG_SPL_TEXT_BASE=0xFFE00000 -CONFIG_SYS_PROMPT="SOCFPGA_AGILEX # " CONFIG_DM_RESET=y CONFIG_SPL_STACK=0xffe3f000 CONFIG_TARGET_SOCFPGA_AGILEX_SOCDK=y @@ -42,6 +41,7 @@ CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x3c00000 CONFIG_SPL_TARGET="spl/u-boot-spl-dtb.hex" CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="SOCFPGA_AGILEX # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2082 CONFIG_SYS_BOOTM_LEN=0x2000000 diff --git a/configs/socfpga_agilex_vab_defconfig b/configs/socfpga_agilex_vab_defconfig index 7c83ec9..0b09bd1 100644 --- a/configs/socfpga_agilex_vab_defconfig +++ b/configs/socfpga_agilex_vab_defconfig @@ -13,7 +13,6 @@ CONFIG_ENV_OFFSET=0x200 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_agilex_socdk" CONFIG_SPL_TEXT_BASE=0xFFE00000 -CONFIG_SYS_PROMPT="SOCFPGA_AGILEX # " CONFIG_DM_RESET=y CONFIG_SPL_STACK=0xffe3f000 CONFIG_SOCFPGA_SECURE_VAB_AUTH=y @@ -47,6 +46,7 @@ CONFIG_SPL_ATF=y CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y CONFIG_SPL_TARGET="spl/u-boot-spl-dtb.hex" CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="SOCFPGA_AGILEX # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2082 CONFIG_SYS_BOOTM_LEN=0x2000000 diff --git a/configs/socfpga_n5x_atf_defconfig b/configs/socfpga_n5x_atf_defconfig index 78595c5..7af9e00 100644 --- a/configs/socfpga_n5x_atf_defconfig +++ b/configs/socfpga_n5x_atf_defconfig @@ -13,7 +13,6 @@ CONFIG_ENV_OFFSET=0x200 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_n5x_socdk" CONFIG_SPL_TEXT_BASE=0xFFE00000 -CONFIG_SYS_PROMPT="SOCFPGA_N5X # " CONFIG_DM_RESET=y CONFIG_SPL_STACK=0xffe3f000 CONFIG_TARGET_SOCFPGA_N5X_SOCDK=y @@ -45,6 +44,7 @@ CONFIG_SPL_ATF=y CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y CONFIG_SPL_TARGET="spl/u-boot-spl-dtb.hex" CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="SOCFPGA_N5X # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2079 CONFIG_SYS_BOOTM_LEN=0x2000000 diff --git a/configs/socfpga_n5x_defconfig b/configs/socfpga_n5x_defconfig index 99a12df..2b1af2f 100644 --- a/configs/socfpga_n5x_defconfig +++ b/configs/socfpga_n5x_defconfig @@ -12,7 +12,6 @@ CONFIG_ENV_OFFSET=0x200 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_n5x_socdk" CONFIG_SPL_TEXT_BASE=0xFFE00000 -CONFIG_SYS_PROMPT="SOCFPGA_N5X # " CONFIG_DM_RESET=y CONFIG_SPL_STACK=0xffe3f000 CONFIG_TARGET_SOCFPGA_N5X_SOCDK=y @@ -39,6 +38,7 @@ CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x3c00000 CONFIG_SPL_TARGET="spl/u-boot-spl-dtb.hex" CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="SOCFPGA_N5X # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2079 CONFIG_SYS_BOOTM_LEN=0x2000000 diff --git a/configs/socfpga_n5x_vab_defconfig b/configs/socfpga_n5x_vab_defconfig index e8c62d0..c9bf337 100644 --- a/configs/socfpga_n5x_vab_defconfig +++ b/configs/socfpga_n5x_vab_defconfig @@ -13,7 +13,6 @@ CONFIG_ENV_OFFSET=0x200 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_n5x_socdk" CONFIG_SPL_TEXT_BASE=0xFFE00000 -CONFIG_SYS_PROMPT="SOCFPGA_N5X # " CONFIG_DM_RESET=y CONFIG_SPL_STACK=0xffe3f000 CONFIG_SOCFPGA_SECURE_VAB_AUTH=y @@ -46,6 +45,7 @@ CONFIG_SPL_ATF=y CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y CONFIG_SPL_TARGET="spl/u-boot-spl-dtb.hex" CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="SOCFPGA_N5X # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2079 CONFIG_SYS_BOOTM_LEN=0x2000000 diff --git a/configs/socfpga_stratix10_atf_defconfig b/configs/socfpga_stratix10_atf_defconfig index 2d4f705..d1d2ec4 100644 --- a/configs/socfpga_stratix10_atf_defconfig +++ b/configs/socfpga_stratix10_atf_defconfig @@ -13,7 +13,6 @@ CONFIG_ENV_OFFSET=0x200 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_stratix10_socdk" CONFIG_SPL_TEXT_BASE=0xFFE00000 -CONFIG_SYS_PROMPT="SOCFPGA_STRATIX10 # " CONFIG_DM_RESET=y CONFIG_SPL_STACK=0xffe3f000 CONFIG_TARGET_SOCFPGA_STRATIX10_SOCDK=y @@ -45,6 +44,7 @@ CONFIG_SPL_ATF=y CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y CONFIG_SPL_TARGET="spl/u-boot-spl-dtb.hex" CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="SOCFPGA_STRATIX10 # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2085 CONFIG_SYS_BOOTM_LEN=0x2000000 diff --git a/configs/socfpga_stratix10_defconfig b/configs/socfpga_stratix10_defconfig index 7d078dd..31d1868 100644 --- a/configs/socfpga_stratix10_defconfig +++ b/configs/socfpga_stratix10_defconfig @@ -12,7 +12,6 @@ CONFIG_ENV_OFFSET=0x200 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_stratix10_socdk" CONFIG_SPL_TEXT_BASE=0xFFE00000 -CONFIG_SYS_PROMPT="SOCFPGA_STRATIX10 # " CONFIG_DM_RESET=y CONFIG_SPL_STACK=0xffe3f000 CONFIG_TARGET_SOCFPGA_STRATIX10_SOCDK=y @@ -43,6 +42,7 @@ CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x3C00000 CONFIG_SPL_TARGET="spl/u-boot-spl-dtb.hex" CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="SOCFPGA_STRATIX10 # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2085 CONFIG_SYS_BOOTM_LEN=0x2000000 diff --git a/configs/spring_defconfig b/configs/spring_defconfig index 392d8d6..2152596 100644 --- a/configs/spring_defconfig +++ b/configs/spring_defconfig @@ -19,7 +19,6 @@ CONFIG_ENV_OFFSET=0x3FC000 CONFIG_ENV_SECT_SIZE=0x4000 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-spring" CONFIG_SPL_TEXT_BASE=0x02023400 -CONFIG_SYS_PROMPT="spring # " CONFIG_SPL=y CONFIG_DEBUG_UART_BASE=0x12c30000 CONFIG_DEBUG_UART_CLOCK=100000000 @@ -33,6 +32,7 @@ CONFIG_SILENT_CONSOLE=y # CONFIG_SPL_FRAMEWORK is not set CONFIG_SPL_FOOTPRINT_LIMIT=y CONFIG_SPL_MAX_FOOTPRINT=0x3800 +CONFIG_SYS_PROMPT="spring # " CONFIG_SYS_PBSIZE=1024 CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y diff --git a/configs/starfive_visionfive2_defconfig b/configs/starfive_visionfive2_defconfig index e9b63e5..62c7ae7 100644 --- a/configs/starfive_visionfive2_defconfig +++ b/configs/starfive_visionfive2_defconfig @@ -6,19 +6,11 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80000000 CONFIG_SF_DEFAULT_SPEED=100000000 -CONFIG_ENV_SUPPORT=y -CONFIG_SAVEENV=y -CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_NOWHERE=y -CONFIG_ENV_IS_IN_SPI_FLASH=y -CONFIG_ENV_SECT_SIZE_AUTO=y CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0xf0000 -CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="jh7110-starfive-visionfive-2" CONFIG_SPL_TEXT_BASE=0x8000000 -CONFIG_SYS_PROMPT="StarFive # " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_SPL_MMC=y @@ -36,19 +28,22 @@ CONFIG_ARCH_RV64I=y CONFIG_CMODEL_MEDANY=y CONFIG_RISCV_SMODE=y # CONFIG_OF_BOARD_FIXUP is not set +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_FIT=y +CONFIG_OF_BOARD_SETUP=y CONFIG_DISTRO_DEFAULTS=y CONFIG_QSPI_BOOT=y CONFIG_SD_BOOT=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 debug rootwait earlycon=sbi" CONFIG_USE_PREBOOT=y -CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr};fdt addr ${fdtcontroladdr};" +CONFIG_PREBOOT="nvme scan; usb start; setenv fdt_addr ${fdtcontroladdr}; fdt addr ${fdtcontroladdr};" CONFIG_DEFAULT_FDT_FILE="starfive/jh7110-starfive-visionfive-2.dtb" CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y CONFIG_ID_EEPROM=y CONFIG_SYS_EEPROM_BUS_NUM=5 +CONFIG_PCI_INIT_R=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x0 CONFIG_SPL_BSS_START_ADDR=0x8040000 @@ -64,6 +59,7 @@ CONFIG_SPL_I2C=y CONFIG_SPL_DM_SPI_FLASH=y CONFIG_SPL_DM_RESET=y CONFIG_SPL_SPI_LOAD=y +CONFIG_SYS_PROMPT="StarFive # " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=276 CONFIG_SYS_BOOTM_LEN=0x4000000 @@ -77,6 +73,10 @@ CONFIG_CMD_PCI=y CONFIG_CMD_USB=y CONFIG_CMD_TFTPPUT=y CONFIG_OF_BOARD=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_NOWHERE=y +CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_ENV_SECT_SIZE_AUTO=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_REGMAP=y @@ -124,4 +124,8 @@ CONFIG_TIMER_EARLY=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_PCI=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_PCI=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_PCI=y CONFIG_USB_KEYBOARD=y diff --git a/configs/stih410-b2260_defconfig b/configs/stih410-b2260_defconfig index edfb195..3160a9b 100644 --- a/configs/stih410-b2260_defconfig +++ b/configs/stih410-b2260_defconfig @@ -9,7 +9,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x7bdfff10 CONFIG_ENV_SIZE=0x4000 CONFIG_DEFAULT_DEVICE_TREE="stih410-b2260" -CONFIG_SYS_PROMPT="stih410-b2260 => " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_IDENT_STRING="STMicroelectronics STiH410-B2260" CONFIG_SYS_LOAD_ADDR=0x40000000 @@ -19,6 +18,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyAS1,115200 CONSOLE=/dev/ttyAS1 consoleblank=0 root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait mem=992M@0x40000000 vmalloc=256m" # CONFIG_DISPLAY_CPUINFO is not set +CONFIG_SYS_PROMPT="stih410-b2260 => " CONFIG_SYS_PBSIZE=1058 CONFIG_SYS_BOOTM_LEN=0x1000000 CONFIG_CMD_ASKENV=y diff --git a/configs/stm32746g-eval_defconfig b/configs/stm32746g-eval_defconfig index aba8b64..b2c30b8 100644 --- a/configs/stm32746g-eval_defconfig +++ b/configs/stm32746g-eval_defconfig @@ -7,7 +7,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20050000 CONFIG_ENV_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="stm32746g-eval" -CONFIG_SYS_PROMPT="U-Boot > " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_STM32F7=y @@ -22,6 +21,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_BOARD_LATE_INIT=y +CONFIG_SYS_PROMPT="U-Boot > " CONFIG_SYS_PBSIZE=1050 CONFIG_CMD_GPT=y # CONFIG_RANDOM_UUID is not set diff --git a/configs/stm32746g-eval_spl_defconfig b/configs/stm32746g-eval_spl_defconfig index 03e123e..6f2f5ec 100644 --- a/configs/stm32746g-eval_spl_defconfig +++ b/configs/stm32746g-eval_spl_defconfig @@ -11,7 +11,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20050000 CONFIG_ENV_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="stm32746g-eval" CONFIG_SPL_TEXT_BASE=0x8000000 -CONFIG_SYS_PROMPT="U-Boot > " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_SERIAL=y @@ -39,6 +38,7 @@ CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_XIP_SUPPORT=y CONFIG_SYS_SPL_ARGS_ADDR=0x80c0000 CONFIG_SPL_DM_RESET=y +CONFIG_SYS_PROMPT="U-Boot > " CONFIG_SYS_PBSIZE=1050 CONFIG_CMD_GPT=y # CONFIG_RANDOM_UUID is not set diff --git a/configs/stm32f429-discovery_defconfig b/configs/stm32f429-discovery_defconfig index ce30656..682d297 100644 --- a/configs/stm32f429-discovery_defconfig +++ b/configs/stm32f429-discovery_defconfig @@ -8,7 +8,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x10010000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="stm32f429-disco" -CONFIG_SYS_PROMPT="U-Boot > " CONFIG_STM32F4=y CONFIG_TARGET_STM32F429_DISCOVERY=y CONFIG_SYS_LOAD_ADDR=0x90400000 @@ -21,6 +20,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_MISC_INIT_R=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot > " CONFIG_SYS_PBSIZE=1050 CONFIG_CMD_IMLS=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/stm32f429-evaluation_defconfig b/configs/stm32f429-evaluation_defconfig index e41c462..f460c6f 100644 --- a/configs/stm32f429-evaluation_defconfig +++ b/configs/stm32f429-evaluation_defconfig @@ -7,7 +7,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x10010000 CONFIG_ENV_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="stm32429i-eval" -CONFIG_SYS_PROMPT="U-Boot > " CONFIG_STM32F4=y CONFIG_TARGET_STM32F429_EVALUATION=y CONFIG_SYS_LOAD_ADDR=0x400000 @@ -15,6 +14,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_CPUINFO is not set CONFIG_MISC_INIT_R=y +CONFIG_SYS_PROMPT="U-Boot > " CONFIG_SYS_PBSIZE=1050 CONFIG_CMD_IMLS=y CONFIG_CMD_GPT=y diff --git a/configs/stm32f469-discovery_defconfig b/configs/stm32f469-discovery_defconfig index 35d18d5..21c5498 100644 --- a/configs/stm32f469-discovery_defconfig +++ b/configs/stm32f469-discovery_defconfig @@ -7,7 +7,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x10010000 CONFIG_ENV_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="stm32f469-disco" -CONFIG_SYS_PROMPT="U-Boot > " CONFIG_STM32F4=y CONFIG_TARGET_STM32F469_DISCOVERY=y CONFIG_SYS_LOAD_ADDR=0x400000 @@ -15,6 +14,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_CPUINFO is not set CONFIG_MISC_INIT_R=y +CONFIG_SYS_PROMPT="U-Boot > " CONFIG_SYS_PBSIZE=1050 CONFIG_CMD_IMLS=y CONFIG_CMD_GPT=y diff --git a/configs/stm32f746-disco_defconfig b/configs/stm32f746-disco_defconfig index bb98ee3..1fb30d8 100644 --- a/configs/stm32f746-disco_defconfig +++ b/configs/stm32f746-disco_defconfig @@ -7,7 +7,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20050000 CONFIG_ENV_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="stm32f746-disco" -CONFIG_SYS_PROMPT="U-Boot > " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_STM32F7=y @@ -22,6 +21,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_BOARD_LATE_INIT=y +CONFIG_SYS_PROMPT="U-Boot > " CONFIG_SYS_PBSIZE=1050 CONFIG_CMD_GPT=y # CONFIG_RANDOM_UUID is not set diff --git a/configs/stm32f746-disco_spl_defconfig b/configs/stm32f746-disco_spl_defconfig index 84aaec1..25ea254 100644 --- a/configs/stm32f746-disco_spl_defconfig +++ b/configs/stm32f746-disco_spl_defconfig @@ -11,7 +11,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20050000 CONFIG_ENV_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="stm32f746-disco" CONFIG_SPL_TEXT_BASE=0x8000000 -CONFIG_SYS_PROMPT="U-Boot > " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_SERIAL=y @@ -39,6 +38,7 @@ CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_XIP_SUPPORT=y CONFIG_SYS_SPL_ARGS_ADDR=0x80c0000 CONFIG_SPL_DM_RESET=y +CONFIG_SYS_PROMPT="U-Boot > " CONFIG_SYS_PBSIZE=1050 CONFIG_CMD_GPT=y # CONFIG_RANDOM_UUID is not set diff --git a/configs/stm32f769-disco_defconfig b/configs/stm32f769-disco_defconfig index 72ef133..a92032d 100644 --- a/configs/stm32f769-disco_defconfig +++ b/configs/stm32f769-disco_defconfig @@ -7,7 +7,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20050000 CONFIG_ENV_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="stm32f769-disco" -CONFIG_SYS_PROMPT="U-Boot > " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_STM32F7=y @@ -21,6 +20,7 @@ CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel" # CONFIG_DISPLAY_CPUINFO is not set +CONFIG_SYS_PROMPT="U-Boot > " CONFIG_SYS_PBSIZE=1050 CONFIG_CMD_GPT=y # CONFIG_RANDOM_UUID is not set diff --git a/configs/stm32f769-disco_spl_defconfig b/configs/stm32f769-disco_spl_defconfig index dd17cad..deb7963 100644 --- a/configs/stm32f769-disco_spl_defconfig +++ b/configs/stm32f769-disco_spl_defconfig @@ -11,7 +11,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20050000 CONFIG_ENV_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="stm32f769-disco" CONFIG_SPL_TEXT_BASE=0x8000000 -CONFIG_SYS_PROMPT="U-Boot > " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_SERIAL=y @@ -38,6 +37,7 @@ CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_XIP_SUPPORT=y CONFIG_SYS_SPL_ARGS_ADDR=0x81c0000 CONFIG_SPL_DM_RESET=y +CONFIG_SYS_PROMPT="U-Boot > " CONFIG_SYS_PBSIZE=1050 CONFIG_CMD_GPT=y # CONFIG_RANDOM_UUID is not set diff --git a/configs/stm32h743-disco_defconfig b/configs/stm32h743-disco_defconfig index 3d9d8fc..a8bf332 100644 --- a/configs/stm32h743-disco_defconfig +++ b/configs/stm32h743-disco_defconfig @@ -7,7 +7,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x24040000 CONFIG_ENV_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="stm32h743i-disco" -CONFIG_SYS_PROMPT="U-Boot > " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_STM32H7=y CONFIG_TARGET_STM32H743_DISCO=y @@ -19,6 +18,7 @@ CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_DEFAULT_FDT_FILE="stm32h743i-disco" # CONFIG_DISPLAY_CPUINFO is not set +CONFIG_SYS_PROMPT="U-Boot > " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=282 CONFIG_CMD_GPT=y diff --git a/configs/stm32h743-eval_defconfig b/configs/stm32h743-eval_defconfig index 57aa48f..2f47041 100644 --- a/configs/stm32h743-eval_defconfig +++ b/configs/stm32h743-eval_defconfig @@ -7,7 +7,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x24040000 CONFIG_ENV_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="stm32h743i-eval" -CONFIG_SYS_PROMPT="U-Boot > " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_STM32H7=y CONFIG_TARGET_STM32H743_EVAL=y @@ -19,6 +18,7 @@ CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_DEFAULT_FDT_FILE="stm32h743i-eval" # CONFIG_DISPLAY_CPUINFO is not set +CONFIG_SYS_PROMPT="U-Boot > " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=282 CONFIG_CMD_GPT=y diff --git a/configs/stm32h750-art-pi_defconfig b/configs/stm32h750-art-pi_defconfig index 3e4c7f9..80ed852 100644 --- a/configs/stm32h750-art-pi_defconfig +++ b/configs/stm32h750-art-pi_defconfig @@ -7,7 +7,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x24040000 CONFIG_ENV_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="stm32h750i-art-pi" -CONFIG_SYS_PROMPT="U-Boot > " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_STM32H7=y CONFIG_TARGET_STM32H750_ART_PI=y @@ -25,6 +24,7 @@ CONFIG_DEFAULT_FDT_FILE="stm32h750i-art-pi" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_LATE_INIT=y +CONFIG_SYS_PROMPT="U-Boot > " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=282 CONFIG_CMD_GPT=y diff --git a/configs/stm32mp13_defconfig b/configs/stm32mp13_defconfig index 82b6274..4e83753 100644 --- a/configs/stm32mp13_defconfig +++ b/configs/stm32mp13_defconfig @@ -5,7 +5,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x180000 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc0400000 CONFIG_ENV_OFFSET=0x900000 CONFIG_DEFAULT_DEVICE_TREE="stm32mp135f-dk" -CONFIG_SYS_PROMPT="STM32MP> " CONFIG_STM32MP13x=y CONFIG_DDR_CACHEABLE_SIZE=0x8000000 CONFIG_CMD_STM32KEY=y @@ -19,6 +18,7 @@ CONFIG_FIT=y CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=1 CONFIG_BOOTCOMMAND="run bootcmd_stm32mp" +CONFIG_SYS_PROMPT="STM32MP> " CONFIG_SYS_BOOTM_LEN=0x2000000 CONFIG_CMD_ADTIMG=y CONFIG_CMD_ERASEENV=y diff --git a/configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig b/configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig index e017454..defe07c 100644 --- a/configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig +++ b/configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig @@ -6,7 +6,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc0100000 CONFIG_ENV_OFFSET=0x280000 CONFIG_DEFAULT_DEVICE_TREE="stm32mp157a-icore-stm32mp1-ctouch2" CONFIG_SPL_TEXT_BASE=0x2FFC2500 -CONFIG_SYS_PROMPT="STM32MP> " CONFIG_SPL_MMC=y CONFIG_SPL_STACK=0x30000000 CONFIG_SPL=y @@ -31,6 +30,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=3 CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y +CONFIG_SYS_PROMPT="STM32MP> " CONFIG_SYS_PBSIZE=1050 CONFIG_SYS_BOOTM_LEN=0x2000000 CONFIG_CMD_ADTIMG=y diff --git a/configs/stm32mp15-icore-stm32mp1-edimm2.2_defconfig b/configs/stm32mp15-icore-stm32mp1-edimm2.2_defconfig index e726846..d12a5ef 100644 --- a/configs/stm32mp15-icore-stm32mp1-edimm2.2_defconfig +++ b/configs/stm32mp15-icore-stm32mp1-edimm2.2_defconfig @@ -6,7 +6,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc0100000 CONFIG_ENV_OFFSET=0x280000 CONFIG_DEFAULT_DEVICE_TREE="stm32mp157a-icore-stm32mp1-edimm2.2" CONFIG_SPL_TEXT_BASE=0x2FFC2500 -CONFIG_SYS_PROMPT="STM32MP> " CONFIG_SPL_MMC=y CONFIG_SPL_STACK=0x30000000 CONFIG_SPL=y @@ -31,6 +30,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=3 CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y +CONFIG_SYS_PROMPT="STM32MP> " CONFIG_SYS_PBSIZE=1050 CONFIG_SYS_BOOTM_LEN=0x2000000 CONFIG_CMD_ADTIMG=y diff --git a/configs/stm32mp15-microgea-stm32mp1-microdev2-of7_defconfig b/configs/stm32mp15-microgea-stm32mp1-microdev2-of7_defconfig index b910d47..fc23a8c 100644 --- a/configs/stm32mp15-microgea-stm32mp1-microdev2-of7_defconfig +++ b/configs/stm32mp15-microgea-stm32mp1-microdev2-of7_defconfig @@ -6,7 +6,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc0100000 CONFIG_ENV_OFFSET=0x280000 CONFIG_DEFAULT_DEVICE_TREE="stm32mp157a-microgea-stm32mp1-microdev2.0-of7" CONFIG_SPL_TEXT_BASE=0x2FFC2500 -CONFIG_SYS_PROMPT="STM32MP> " CONFIG_SPL_MMC=y CONFIG_SPL_STACK=0x30000000 CONFIG_SPL=y @@ -31,6 +30,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=3 CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y +CONFIG_SYS_PROMPT="STM32MP> " CONFIG_SYS_PBSIZE=1050 CONFIG_SYS_BOOTM_LEN=0x2000000 CONFIG_CMD_ADTIMG=y diff --git a/configs/stm32mp15-microgea-stm32mp1-microdev2_defconfig b/configs/stm32mp15-microgea-stm32mp1-microdev2_defconfig index 5007e62..a9996e3 100644 --- a/configs/stm32mp15-microgea-stm32mp1-microdev2_defconfig +++ b/configs/stm32mp15-microgea-stm32mp1-microdev2_defconfig @@ -6,7 +6,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc0100000 CONFIG_ENV_OFFSET=0x280000 CONFIG_DEFAULT_DEVICE_TREE="stm32mp157a-microgea-stm32mp1-microdev2.0" CONFIG_SPL_TEXT_BASE=0x2FFC2500 -CONFIG_SYS_PROMPT="STM32MP> " CONFIG_SPL_MMC=y CONFIG_SPL_STACK=0x30000000 CONFIG_SPL=y @@ -31,6 +30,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=3 CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y +CONFIG_SYS_PROMPT="STM32MP> " CONFIG_SYS_PBSIZE=1050 CONFIG_SYS_BOOTM_LEN=0x2000000 CONFIG_CMD_ADTIMG=y diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig index 9ea5aaa..dc491cf 100644 --- a/configs/stm32mp15_basic_defconfig +++ b/configs/stm32mp15_basic_defconfig @@ -8,7 +8,6 @@ CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1" CONFIG_SPL_TEXT_BASE=0x2FFC2500 -CONFIG_SYS_PROMPT="STM32MP> " CONFIG_SPL_MMC=y CONFIG_SPL_STACK=0x30000000 CONFIG_SPL=y @@ -46,6 +45,7 @@ CONFIG_SPL_POWER=y CONFIG_SPL_SPI_FLASH_MTD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000 CONFIG_FDT_SIMPLEFB=y +CONFIG_SYS_PROMPT="STM32MP> " CONFIG_SYS_PBSIZE=1050 CONFIG_SYS_BOOTM_LEN=0x2000000 CONFIG_CMD_ADTIMG=y diff --git a/configs/stm32mp15_defconfig b/configs/stm32mp15_defconfig index 4d0a81f..4f7dca4 100644 --- a/configs/stm32mp15_defconfig +++ b/configs/stm32mp15_defconfig @@ -6,7 +6,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc0100000 CONFIG_ENV_OFFSET=0x900000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1" -CONFIG_SYS_PROMPT="STM32MP> " CONFIG_DDR_CACHEABLE_SIZE=0x8000000 CONFIG_CMD_STM32KEY=y CONFIG_TYPEC_STUSB160X=y @@ -22,6 +21,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=1 CONFIG_BOOTCOMMAND="run bootcmd_stm32mp" CONFIG_FDT_SIMPLEFB=y +CONFIG_SYS_PROMPT="STM32MP> " CONFIG_SYS_PBSIZE=1050 CONFIG_SYS_BOOTM_LEN=0x2000000 CONFIG_CMD_ADTIMG=y diff --git a/configs/stm32mp15_dhcom_basic_defconfig b/configs/stm32mp15_dhcom_basic_defconfig index af74166..630c175 100644 --- a/configs/stm32mp15_dhcom_basic_defconfig +++ b/configs/stm32mp15_dhcom_basic_defconfig @@ -9,7 +9,6 @@ CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="stm32mp15xx-dhcom-pdk2" CONFIG_SPL_TEXT_BASE=0x2FFC2500 -CONFIG_SYS_PROMPT="STM32MP> " CONFIG_SPL_MMC=y CONFIG_BOOTCOUNT_BOOTLIMIT=3 CONFIG_SYS_BOOTCOUNT_ADDR=0x5C00A14C @@ -56,6 +55,7 @@ CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_SPI_FLASH_MTD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000 CONFIG_SPL_TARGET="u-boot.itb" +CONFIG_SYS_PROMPT="STM32MP> " CONFIG_SYS_PBSIZE=1050 CONFIG_SYS_BOOTM_LEN=0x2000000 # CONFIG_CMD_ELF is not set diff --git a/configs/stm32mp15_dhcor_basic_defconfig b/configs/stm32mp15_dhcor_basic_defconfig index b7f372f..26924a0 100644 --- a/configs/stm32mp15_dhcor_basic_defconfig +++ b/configs/stm32mp15_dhcor_basic_defconfig @@ -9,7 +9,6 @@ CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="stm32mp15xx-dhcor-avenger96" CONFIG_SPL_TEXT_BASE=0x2FFC2500 -CONFIG_SYS_PROMPT="STM32MP> " CONFIG_SPL_MMC=y CONFIG_BOOTCOUNT_BOOTLIMIT=3 CONFIG_SYS_BOOTCOUNT_ADDR=0x5C00A14C @@ -54,6 +53,7 @@ CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_SPI_FLASH_MTD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000 CONFIG_SPL_TARGET="u-boot.itb" +CONFIG_SYS_PROMPT="STM32MP> " CONFIG_SYS_PBSIZE=1050 CONFIG_SYS_BOOTM_LEN=0x2000000 # CONFIG_CMD_ELF is not set diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig index 0a7d862..6f4876f 100644 --- a/configs/stm32mp15_trusted_defconfig +++ b/configs/stm32mp15_trusted_defconfig @@ -6,7 +6,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc0100000 CONFIG_ENV_OFFSET=0x280000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1" -CONFIG_SYS_PROMPT="STM32MP> " CONFIG_DDR_CACHEABLE_SIZE=0x10000000 CONFIG_CMD_STM32KEY=y CONFIG_TYPEC_STUSB160X=y @@ -23,6 +22,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=1 CONFIG_BOOTCOMMAND="run bootcmd_stm32mp" CONFIG_FDT_SIMPLEFB=y +CONFIG_SYS_PROMPT="STM32MP> " CONFIG_SYS_PBSIZE=1050 CONFIG_SYS_BOOTM_LEN=0x2000000 CONFIG_CMD_ADTIMG=y diff --git a/configs/stmark2_defconfig b/configs/stmark2_defconfig index 84ccc39..ec17c55 100644 --- a/configs/stmark2_defconfig +++ b/configs/stmark2_defconfig @@ -6,7 +6,6 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x40000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DEFAULT_DEVICE_TREE="stmark2" -CONFIG_SYS_PROMPT="stmark2 $ " CONFIG_SYS_MONITOR_LEN=262144 CONFIG_SYS_LOAD_ADDR=0x40010000 CONFIG_TARGET_STMARK2=y @@ -21,6 +20,7 @@ CONFIG_BOOTCOMMAND="sf probe 0:1 50000000; sf read ${loadaddr} 0x100000 ${kern_s CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y # CONFIG_CMDLINE_EDITING is not set +CONFIG_SYS_PROMPT="stmark2 $ " CONFIG_SYS_PBSIZE=283 # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/stv0991_defconfig b/configs/stv0991_defconfig index 750437b..e6da8bb 100644 --- a/configs/stv0991_defconfig +++ b/configs/stv0991_defconfig @@ -8,7 +8,6 @@ CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0x30000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DEFAULT_DEVICE_TREE="stv0991" -CONFIG_SYS_PROMPT="STV0991> " CONFIG_SYS_LOAD_ADDR=0x0 CONFIG_ENV_ADDR=0x188000 CONFIG_SYS_MEMTEST_START=0x00000000 @@ -23,6 +22,7 @@ CONFIG_BOOTCOMMAND="go 0x40040000" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y # CONFIG_AUTO_COMPLETE is not set +CONFIG_SYS_PROMPT="STV0991> " CONFIG_SYS_PBSIZE=1050 CONFIG_CMD_MEMTEST=y CONFIG_CMD_SPI=y diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig index 81a8377..f2c148e 100644 --- a/configs/taurus_defconfig +++ b/configs/taurus_defconfig @@ -22,7 +22,6 @@ CONFIG_SPL_LDSCRIPT="arch/arm/cpu/u-boot-spl.lds" CONFIG_ENV_OFFSET=0x100000 CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20-taurus" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SPL_STACK=0x304000 CONFIG_SPL_SYS_MALLOC_F_LEN=0x1000 CONFIG_SPL=y @@ -61,6 +60,7 @@ CONFIG_SPL_NAND_SOFTECC=y CONFIG_SPL_NAND_BASE=y CONFIG_SPL_DM_SPI_FLASH=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_SYS_XTRACE is not set diff --git a/configs/tb100_defconfig b/configs/tb100_defconfig index b0387aa..70d3ad0 100644 --- a/configs/tb100_defconfig +++ b/configs/tb100_defconfig @@ -7,12 +7,12 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80000f30 CONFIG_ENV_SIZE=0x800 CONFIG_DEFAULT_DEVICE_TREE="abilis_tb100" -CONFIG_SYS_PROMPT="[tb100]:~# " CONFIG_SYS_CLK_FREQ=500000000 CONFIG_SYS_LOAD_ADDR=0x82000000 CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200n8" +CONFIG_SYS_PROMPT="[tb100]:~# " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=284 CONFIG_SYS_BOOTM_LEN=0x2000000 diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig index ee4dca4..8fbe84f 100644 --- a/configs/tbs2910_defconfig +++ b/configs/tbs2910_defconfig @@ -9,7 +9,6 @@ CONFIG_MX6Q=y CONFIG_TARGET_TBS2910=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-tbs2910" -CONFIG_SYS_PROMPT="Matrix U-Boot> " CONFIG_PRE_CON_BUF_ADDR=0x7c000000 CONFIG_CMD_HDMIDETECT=y CONFIG_PCI=y @@ -29,6 +28,7 @@ CONFIG_PREBOOT="echo PCI:; pci enum; pci 1; usb start" CONFIG_DEFAULT_FDT_FILE="imx6q-tbs2910.dtb" CONFIG_PRE_CONSOLE_BUFFER=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="Matrix U-Boot> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=544 # CONFIG_CMD_BDI is not set diff --git a/configs/tec-ng_defconfig b/configs/tec-ng_defconfig index 4776e92..48ab49b 100644 --- a/configs/tec-ng_defconfig +++ b/configs/tec-ng_defconfig @@ -8,7 +8,6 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFFE000 CONFIG_DEFAULT_DEVICE_TREE="tegra30-tec-ng" CONFIG_SPL_TEXT_BASE=0x80108000 -CONFIG_SYS_PROMPT="Tegra30 (TEC-NG) # " CONFIG_SPL_STACK=0x800ffffc CONFIG_TEGRA30=y CONFIG_TARGET_TEC_NG=y @@ -25,6 +24,7 @@ CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x80090000 CONFIG_SYS_SPL_MALLOC_SIZE=0x10000 +CONFIG_SYS_PROMPT="Tegra30 (TEC-NG) # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2084 # CONFIG_CMD_IMI is not set diff --git a/configs/tec_defconfig b/configs/tec_defconfig index 8a5d959..bcdd7c1 100644 --- a/configs/tec_defconfig +++ b/configs/tec_defconfig @@ -7,7 +7,6 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x1FFE0000 CONFIG_DEFAULT_DEVICE_TREE="tegra20-tec" CONFIG_SPL_TEXT_BASE=0x00108000 -CONFIG_SYS_PROMPT="Tegra20 (TEC) # " CONFIG_SPL_STACK=0xffffc CONFIG_TEGRA20=y CONFIG_TARGET_TEC=y @@ -23,6 +22,7 @@ CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x90000 CONFIG_SYS_SPL_MALLOC_SIZE=0x10000 +CONFIG_SYS_PROMPT="Tegra20 (TEC) # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2081 # CONFIG_CMD_IMI is not set diff --git a/configs/th1520_lpi4a_defconfig b/configs/th1520_lpi4a_defconfig index 710ec6a..944078b 100644 --- a/configs/th1520_lpi4a_defconfig +++ b/configs/th1520_lpi4a_defconfig @@ -5,7 +5,6 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000 CONFIG_DEFAULT_DEVICE_TREE="th1520-lichee-pi-4a" -CONFIG_SYS_PROMPT="LPI4A=> " CONFIG_SYS_LOAD_ADDR=0x80200000 # CONFIG_SMP is not set CONFIG_TARGET_TH1520_LPI4A=y @@ -26,6 +25,7 @@ CONFIG_LOG=y CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_SYS_PROMPT="LPI4A=> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=276 CONFIG_CMD_CONFIG=y diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig index 6302c1a..8d79e41 100644 --- a/configs/thuban_defconfig +++ b/configs/thuban_defconfig @@ -13,7 +13,6 @@ CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="am335x-draco" CONFIG_AM33XX=y CONFIG_SYS_MPUCLK=300 -CONFIG_SYS_PROMPT="U-Boot# " CONFIG_TARGET_THUBAN=y CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -52,6 +51,7 @@ CONFIG_SPL_WATCHDOG=y CONFIG_SPL_YMODEM_SUPPORT=y # CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC is not set CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot# " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=1049 CONFIG_CMD_ASKENV=y diff --git a/configs/thunderx_88xx_defconfig b/configs/thunderx_88xx_defconfig index ef508ab..5c24b38 100644 --- a/configs/thunderx_88xx_defconfig +++ b/configs/thunderx_88xx_defconfig @@ -9,7 +9,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x57fff0 CONFIG_ENV_SIZE=0x1000 CONFIG_DEFAULT_DEVICE_TREE="thunderx-88xx" -CONFIG_SYS_PROMPT="ThunderX_88XX> " CONFIG_DEBUG_UART_BASE=0x87e024000000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_IDENT_STRING=" for Cavium Thunder CN88XX ARM v8 Multi-Core" @@ -23,6 +22,7 @@ CONFIG_BOOTARGS="console=ttyAMA0,115200n8 earlycon=pl011,0x87e024000000 debug ma # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y # CONFIG_AUTO_COMPLETE is not set +CONFIG_SYS_PROMPT="ThunderX_88XX> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=544 diff --git a/configs/topic_miami_defconfig b/configs/topic_miami_defconfig index ef1b66e..f60b812 100644 --- a/configs/topic_miami_defconfig +++ b/configs/topic_miami_defconfig @@ -9,7 +9,6 @@ CONFIG_SF_DEFAULT_SPEED=108000000 CONFIG_ENV_SIZE=0x8000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="zynq-topic-miami" -CONFIG_SYS_PROMPT="zynq-uboot> " CONFIG_SPL_STACK_R_ADDR=0x200000 CONFIG_SPL_STACK=0xfffffe00 CONFIG_SPL=y @@ -37,6 +36,7 @@ CONFIG_SYS_SPL_MALLOC=y CONFIG_SYS_SPL_MALLOC_SIZE=0x2000000 CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000 +CONFIG_SYS_PROMPT="zynq-uboot> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=2077 CONFIG_SYS_BOOTM_LEN=0x3c00000 diff --git a/configs/topic_miamilite_defconfig b/configs/topic_miamilite_defconfig index af829ac..5533210 100644 --- a/configs/topic_miamilite_defconfig +++ b/configs/topic_miamilite_defconfig @@ -9,7 +9,6 @@ CONFIG_SF_DEFAULT_SPEED=108000000 CONFIG_ENV_SIZE=0x8000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="zynq-topic-miamilite" -CONFIG_SYS_PROMPT="zynq-uboot> " CONFIG_SPL_STACK_R_ADDR=0x200000 CONFIG_SPL_STACK=0xfffffe00 CONFIG_SPL=y @@ -37,6 +36,7 @@ CONFIG_SYS_SPL_MALLOC=y CONFIG_SYS_SPL_MALLOC_SIZE=0x2000000 CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000 +CONFIG_SYS_PROMPT="zynq-uboot> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=2077 CONFIG_SYS_BOOTM_LEN=0x3c00000 diff --git a/configs/topic_miamiplus_defconfig b/configs/topic_miamiplus_defconfig index 9287b1d..b9e3fe7 100644 --- a/configs/topic_miamiplus_defconfig +++ b/configs/topic_miamiplus_defconfig @@ -9,7 +9,6 @@ CONFIG_SF_DEFAULT_SPEED=108000000 CONFIG_ENV_SIZE=0x8000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="zynq-topic-miamiplus" -CONFIG_SYS_PROMPT="zynq-uboot> " CONFIG_SPL_STACK_R_ADDR=0x200000 CONFIG_SPL_STACK=0xfffffe00 CONFIG_SPL=y @@ -37,6 +36,7 @@ CONFIG_SYS_SPL_MALLOC=y CONFIG_SYS_SPL_MALLOC_SIZE=0x2000000 CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000 +CONFIG_SYS_PROMPT="zynq-uboot> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=2077 CONFIG_SYS_BOOTM_LEN=0x3c00000 diff --git a/configs/total_compute_defconfig b/configs/total_compute_defconfig index d25ed38..4bb55e1 100644 --- a/configs/total_compute_defconfig +++ b/configs/total_compute_defconfig @@ -7,7 +7,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x8007fff0 CONFIG_ENV_SIZE=0x2a00000 CONFIG_DEFAULT_DEVICE_TREE="total_compute" -CONFIG_SYS_PROMPT="TOTAL_COMPUTE# " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_LOAD_ADDR=0x90000000 CONFIG_SYS_MEMTEST_START=0x80000000 @@ -25,6 +24,7 @@ CONFIG_BOOTCOMMAND="if part number mmc 0 vbmeta is_avb; then echo MMC with vbme CONFIG_AVB_VERIFY=y CONFIG_AVB_BUF_ADDR=0x90000000 CONFIG_AVB_BUF_SIZE=0x10000000 +CONFIG_SYS_PROMPT="TOTAL_COMPUTE# " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=544 diff --git a/configs/transformer_t30_defconfig b/configs/transformer_t30_defconfig index 6fe6f25..b7934fd 100644 --- a/configs/transformer_t30_defconfig +++ b/configs/transformer_t30_defconfig @@ -10,7 +10,6 @@ CONFIG_ENV_SIZE=0x3000 CONFIG_ENV_OFFSET=0xFFFFD000 CONFIG_DEFAULT_DEVICE_TREE="tegra30-asus-tf201" CONFIG_SPL_TEXT_BASE=0x80108000 -CONFIG_SYS_PROMPT="Tegra30 (Transformer) # " CONFIG_SPL_STACK=0x800ffffc CONFIG_TEGRA30=y CONFIG_TARGET_TRANSFORMER_T30=y @@ -21,7 +20,6 @@ CONFIG_OF_SYSTEM_SETUP=y CONFIG_BOOTDELAY=0 CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_KEYED_CTRLC=y -CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv gpio_button 150; if run check_button; then poweroff; fi; setenv gpio_button 131; if run check_button; then bootmenu; fi; run bootcmd_mmc1; run bootcmd_mmc0; poweroff;" CONFIG_SPL_FOOTPRINT_LIMIT=y CONFIG_SPL_MAX_FOOTPRINT=0x8000 @@ -30,6 +28,7 @@ CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x80090000 CONFIG_SYS_SPL_MALLOC_SIZE=0x10000 +CONFIG_SYS_PROMPT="Tegra30 (Transformer) # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2084 CONFIG_CMD_BOOTMENU=y @@ -45,7 +44,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_CMD_UMS_ABORT_KEYED=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_PAUSE=y CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_DOS_PARTITION is not set diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig index eace020..eb8800b 100644 --- a/configs/trats2_defconfig +++ b/configs/trats2_defconfig @@ -14,7 +14,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x43dfff10 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x7000 CONFIG_DEFAULT_DEVICE_TREE="exynos4412-trats2" -CONFIG_SYS_PROMPT="Trats2 # " CONFIG_SYS_MONITOR_LEN=262144 CONFIG_SYS_MEM_TOP_HIDE=0x100000 CONFIG_SYS_LOAD_ADDR=0x43e00000 @@ -28,6 +27,7 @@ CONFIG_BOOTCOMMAND="run autoboot" CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_MISC_INIT_R=y +CONFIG_SYS_PROMPT="Trats2 # " CONFIG_SYS_PBSIZE=1024 # CONFIG_CMD_XIMG is not set CONFIG_CMD_THOR_DOWNLOAD=y diff --git a/configs/trats_defconfig b/configs/trats_defconfig index 51fc326..a747654 100644 --- a/configs/trats_defconfig +++ b/configs/trats_defconfig @@ -14,7 +14,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x447fff10 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x7000 CONFIG_DEFAULT_DEVICE_TREE="exynos4210-trats" -CONFIG_SYS_PROMPT="Trats # " CONFIG_SYS_MONITOR_LEN=262144 CONFIG_SYS_MEM_TOP_HIDE=0x100000 CONFIG_SYS_LOAD_ADDR=0x44800000 @@ -27,6 +26,7 @@ CONFIG_BOOTCOMMAND="run autoboot" CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_MISC_INIT_R=y +CONFIG_SYS_PROMPT="Trats # " CONFIG_SYS_PBSIZE=1024 # CONFIG_CMD_XIMG is not set CONFIG_CMD_THOR_DOWNLOAD=y diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig index 9ec08bd..f554df1 100644 --- a/configs/trimslice_defconfig +++ b/configs/trimslice_defconfig @@ -9,7 +9,6 @@ CONFIG_ENV_OFFSET=0xFE000 CONFIG_ENV_SECT_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="tegra20-trimslice" CONFIG_SPL_TEXT_BASE=0x00108000 -CONFIG_SYS_PROMPT="Tegra20 (TrimSlice) # " CONFIG_SPL_STACK=0xffffc CONFIG_TEGRA20=y CONFIG_TARGET_TRIMSLICE=y @@ -25,6 +24,7 @@ CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x90000 CONFIG_SYS_SPL_MALLOC_SIZE=0x10000 +CONFIG_SYS_PROMPT="Tegra20 (TrimSlice) # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2087 # CONFIG_CMD_IMI is not set diff --git a/configs/uDPU_defconfig b/configs/uDPU_defconfig index fa19895..988f9ed 100644 --- a/configs/uDPU_defconfig +++ b/configs/uDPU_defconfig @@ -10,7 +10,6 @@ CONFIG_ENV_OFFSET=0x180000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="armada-3720-uDPU" -CONFIG_SYS_PROMPT="uDPU>> " CONFIG_DEBUG_UART_BASE=0xd0012000 CONFIG_SYS_LOAD_ADDR=0x6000000 CONFIG_DEBUG_UART=y @@ -23,6 +22,7 @@ CONFIG_USE_PREBOOT=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_SYS_PROMPT="uDPU>> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=1048 # CONFIG_CMD_ELF is not set diff --git a/configs/usb_a9263_dataflash_defconfig b/configs/usb_a9263_dataflash_defconfig index 775a4c7..0becbf6 100644 --- a/configs/usb_a9263_dataflash_defconfig +++ b/configs/usb_a9263_dataflash_defconfig @@ -11,7 +11,6 @@ CONFIG_ENV_OFFSET=0x2000 CONFIG_ENV_SECT_SIZE=0x2000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="usb_a9263" -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_LOAD_ADDR=0x22000000 CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y @@ -20,6 +19,7 @@ CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="nboot 21000000 0" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=281 # CONFIG_CMD_BDI is not set diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig index ebd1754..bd8ca4d 100644 --- a/configs/venice2_defconfig +++ b/configs/venice2_defconfig @@ -9,7 +9,6 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFFE000 CONFIG_DEFAULT_DEVICE_TREE="tegra124-venice2" CONFIG_SPL_TEXT_BASE=0x80108000 -CONFIG_SYS_PROMPT="Tegra124 (Venice2) # " CONFIG_SPL_STACK=0x800ffffc CONFIG_TEGRA124=y CONFIG_TARGET_VENICE2=y @@ -25,6 +24,7 @@ CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x80090000 CONFIG_SYS_SPL_MALLOC_SIZE=0x10000 +CONFIG_SYS_PROMPT="Tegra124 (Venice2) # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2086 # CONFIG_CMD_IMI is not set diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig index 2da8ba9..ef1c6f3 100644 --- a/configs/ventana_defconfig +++ b/configs/ventana_defconfig @@ -7,7 +7,6 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFFE000 CONFIG_DEFAULT_DEVICE_TREE="tegra20-ventana" CONFIG_SPL_TEXT_BASE=0x00108000 -CONFIG_SYS_PROMPT="Tegra20 (Ventana) # " CONFIG_SPL_STACK=0xffffc CONFIG_TEGRA20=y CONFIG_TARGET_VENTANA=y @@ -22,6 +21,7 @@ CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x90000 CONFIG_SYS_SPL_MALLOC_SIZE=0x10000 +CONFIG_SYS_PROMPT="Tegra20 (Ventana) # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2085 # CONFIG_CMD_IMI is not set diff --git a/configs/verdin-am62_a53_defconfig b/configs/verdin-am62_a53_defconfig index 889b7e9..fb209b4 100644 --- a/configs/verdin-am62_a53_defconfig +++ b/configs/verdin-am62_a53_defconfig @@ -18,7 +18,6 @@ CONFIG_ENV_OFFSET=0xFFFFDE00 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="k3-am625-verdin-wifi-dev" CONFIG_SPL_TEXT_BASE=0x80080000 -CONFIG_SYS_PROMPT="Verdin AM62 # " CONFIG_DM_RESET=y CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -66,6 +65,7 @@ CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_THERMAL=y CONFIG_SPL_YMODEM_SUPPORT=y +CONFIG_SYS_PROMPT="Verdin AM62 # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_BOOTM_LEN=0x40000000 CONFIG_CMD_ADTIMG=y diff --git a/configs/verdin-imx8mm_defconfig b/configs/verdin-imx8mm_defconfig index 09e14c6..54ea3fb 100644 --- a/configs/verdin-imx8mm_defconfig +++ b/configs/verdin-imx8mm_defconfig @@ -11,7 +11,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mm-verdin-wifi-dev" CONFIG_SPL_TEXT_BASE=0x7E1000 CONFIG_TARGET_VERDIN_IMX8MM=y -CONFIG_SYS_PROMPT="Verdin iMX8MM # " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y @@ -52,6 +51,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y +CONFIG_SYS_PROMPT="Verdin iMX8MM # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2081 diff --git a/configs/verdin-imx8mp_defconfig b/configs/verdin-imx8mp_defconfig index 2df0f4f..6919117 100644 --- a/configs/verdin-imx8mp_defconfig +++ b/configs/verdin-imx8mp_defconfig @@ -15,7 +15,6 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mp-verdin-wifi-dev" CONFIG_SPL_TEXT_BASE=0x920000 CONFIG_TARGET_VERDIN_IMX8MP=y -CONFIG_SYS_PROMPT="Verdin iMX8MP # " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y @@ -62,6 +61,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y CONFIG_SPL_WATCHDOG=y +CONFIG_SYS_PROMPT="Verdin iMX8MP # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2081 diff --git a/configs/vexpress_aemv8a_juno_defconfig b/configs/vexpress_aemv8a_juno_defconfig index 10d55c5..db5463c 100644 --- a/configs/vexpress_aemv8a_juno_defconfig +++ b/configs/vexpress_aemv8a_juno_defconfig @@ -5,7 +5,6 @@ CONFIG_NR_DRAM_BANKS=2 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x8007fff0 CONFIG_DEFAULT_DEVICE_TREE="juno-r2" -CONFIG_SYS_PROMPT="VExpress64# " CONFIG_IDENT_STRING=" vexpress_aemv8a" CONFIG_TARGET_VEXPRESS64_JUNO=y CONFIG_PCI=y @@ -17,6 +16,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyAMA0,115200n8 root=/dev/sda2 rw rootwait earlycon=pl011,0x7ff80000 debug user_debug=31 androidboot.hardware=juno loglevel=9" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_PROMPT="VExpress64# " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=541 diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig index b642f10..0e23b43 100644 --- a/configs/vexpress_aemv8a_semi_defconfig +++ b/configs/vexpress_aemv8a_semi_defconfig @@ -4,7 +4,6 @@ CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_VEXPRESS64=y CONFIG_NR_DRAM_BANKS=2 CONFIG_DEFAULT_DEVICE_TREE="fvp-base-revc" -CONFIG_SYS_PROMPT="VExpress64# " CONFIG_IDENT_STRING=" vexpress_aemv8a" CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0xff000000 @@ -14,6 +13,7 @@ CONFIG_BOOTDELAY=1 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyAMA0 earlycon=pl011,0x1c090000 debug user_debug=31 loglevel=9" # CONFIG_DISPLAY_CPUINFO is not set +CONFIG_SYS_PROMPT="VExpress64# " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=541 diff --git a/configs/vexpress_aemv8r_defconfig b/configs/vexpress_aemv8r_defconfig index 4055d29..b5842b3 100644 --- a/configs/vexpress_aemv8r_defconfig +++ b/configs/vexpress_aemv8r_defconfig @@ -3,7 +3,6 @@ CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_VEXPRESS64=y CONFIG_NR_DRAM_BANKS=2 CONFIG_DEFAULT_DEVICE_TREE="arm_fvp" -CONFIG_SYS_PROMPT="VExpress64# " CONFIG_IDENT_STRING=" vexpress_aemv8r64" CONFIG_TARGET_VEXPRESS64_BASER_FVP=y CONFIG_REMAKE_ELF=y @@ -11,6 +10,7 @@ CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyAMA0 earlycon=pl011,0x9c090000 rootfstype=ext4 root=/dev/vda2 rw rootwait" # CONFIG_DISPLAY_CPUINFO is not set +CONFIG_SYS_PROMPT="VExpress64# " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=541 diff --git a/configs/vinco_defconfig b/configs/vinco_defconfig index 8a99bca..c3d4e9f 100644 --- a/configs/vinco_defconfig +++ b/configs/vinco_defconfig @@ -13,7 +13,6 @@ CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0x10000 CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_DEFAULT_DEVICE_TREE="at91-vinco" -CONFIG_SYS_PROMPT="vinco => " CONFIG_SYS_LOAD_ADDR=0x22000000 CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_SPI_BOOT=y @@ -25,6 +24,7 @@ CONFIG_BOOTCOMMAND="mmc dev 0 0;mmc read ${loadaddr} ${k_offset} ${k_blksize};mm # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="vinco => " CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=282 CONFIG_CMD_BOOTZ=y diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index d0b4e74..26d992d 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -6,7 +6,6 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xC0000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx7s-warp" -CONFIG_OPTEE_TZDRAM_SIZE=0x3000000 CONFIG_TARGET_WARP7=y CONFIG_ARMV7_BOOT_SEC_DEFAULT=y # CONFIG_ARMV7_VIRT is not set @@ -81,4 +80,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" +CONFIG_OPTEE_TZDRAM_SIZE=0x3000000 CONFIG_BOOTM_OPTEE=y diff --git a/configs/x3_t30_defconfig b/configs/x3_t30_defconfig index 540c430..ea7aecc 100644 --- a/configs/x3_t30_defconfig +++ b/configs/x3_t30_defconfig @@ -10,7 +10,6 @@ CONFIG_ENV_SIZE=0x3000 CONFIG_ENV_OFFSET=0xFFFFD000 CONFIG_DEFAULT_DEVICE_TREE="tegra30-lg-p880" CONFIG_SPL_TEXT_BASE=0x80108000 -CONFIG_SYS_PROMPT="Tegra30 (x3) # " CONFIG_SPL_STACK=0x800ffffc CONFIG_TEGRA30=y CONFIG_TARGET_X3_T30=y @@ -22,7 +21,6 @@ CONFIG_OF_SYSTEM_SETUP=y CONFIG_BOOTDELAY=0 CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_KEYED_CTRLC=y -CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="if run check_button; then bootmenu; fi; run bootcmd_mmc1; run bootcmd_mmc0; poweroff;" CONFIG_SPL_FOOTPRINT_LIMIT=y CONFIG_SPL_MAX_FOOTPRINT=0x8000 @@ -31,6 +29,7 @@ CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x80090000 CONFIG_SYS_SPL_MALLOC_SIZE=0x10000 +CONFIG_SYS_PROMPT="Tegra30 (x3) # " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2084 CONFIG_CMD_BOOTMENU=y @@ -45,7 +44,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_CMD_UMS_ABORT_KEYED=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_PAUSE=y CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_DOS_PARTITION is not set diff --git a/configs/xenguest_arm64_defconfig b/configs/xenguest_arm64_defconfig index a696c28..b206f71 100644 --- a/configs/xenguest_arm64_defconfig +++ b/configs/xenguest_arm64_defconfig @@ -6,11 +6,11 @@ CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=1 CONFIG_DEFAULT_DEVICE_TREE="xenguest-arm64" -CONFIG_SYS_PROMPT="xenguest# " CONFIG_IDENT_STRING=" xenguest" CONFIG_SYS_LOAD_ADDR=0x40000000 CONFIG_OF_SYSTEM_SETUP=y CONFIG_BOOTDELAY=10 +CONFIG_SYS_PROMPT="xenguest# " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=1051 # CONFIG_CMD_BDI is not set diff --git a/configs/xilinx_versal_mini_defconfig b/configs/xilinx_versal_mini_defconfig index 78be200..d6d6dc1 100644 --- a/configs/xilinx_versal_mini_defconfig +++ b/configs/xilinx_versal_mini_defconfig @@ -11,7 +11,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xfffe0000 CONFIG_ENV_SIZE=0x80 CONFIG_DEFAULT_DEVICE_TREE="versal-mini" -CONFIG_SYS_PROMPT="Versal> " CONFIG_SYS_MEM_RSVD_FOR_MMU=y # CONFIG_PSCI_RESET is not set CONFIG_SYS_LOAD_ADDR=0x8000000 @@ -29,6 +28,7 @@ CONFIG_CLOCKS=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set # CONFIG_SYS_LONGHELP is not set +CONFIG_SYS_PROMPT="Versal> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=1024 CONFIG_SYS_PBSIZE=1049 diff --git a/configs/xilinx_versal_mini_emmc0_defconfig b/configs/xilinx_versal_mini_emmc0_defconfig index 129ddce..858bb35 100644 --- a/configs/xilinx_versal_mini_emmc0_defconfig +++ b/configs/xilinx_versal_mini_emmc0_defconfig @@ -11,7 +11,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x10000 CONFIG_ENV_SIZE=0x80 CONFIG_DEFAULT_DEVICE_TREE="versal-mini-emmc0" -CONFIG_SYS_PROMPT="Versal> " # CONFIG_PSCI_RESET is not set CONFIG_SYS_LOAD_ADDR=0x8000000 # CONFIG_EXPERT is not set @@ -25,6 +24,7 @@ CONFIG_CLOCKS=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set # CONFIG_SYS_LONGHELP is not set +CONFIG_SYS_PROMPT="Versal> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=1024 CONFIG_SYS_PBSIZE=1049 diff --git a/configs/xilinx_versal_mini_emmc1_defconfig b/configs/xilinx_versal_mini_emmc1_defconfig index 116ec45..2488ede 100644 --- a/configs/xilinx_versal_mini_emmc1_defconfig +++ b/configs/xilinx_versal_mini_emmc1_defconfig @@ -11,7 +11,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x10000 CONFIG_ENV_SIZE=0x80 CONFIG_DEFAULT_DEVICE_TREE="versal-mini-emmc1" -CONFIG_SYS_PROMPT="Versal> " # CONFIG_PSCI_RESET is not set CONFIG_SYS_LOAD_ADDR=0x8000000 # CONFIG_EXPERT is not set @@ -25,6 +24,7 @@ CONFIG_CLOCKS=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set # CONFIG_SYS_LONGHELP is not set +CONFIG_SYS_PROMPT="Versal> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_CBSIZE=1024 CONFIG_SYS_PBSIZE=1049 diff --git a/configs/xilinx_versal_mini_ospi_defconfig b/configs/xilinx_versal_mini_ospi_defconfig index 27b59f8..389ca50 100644 --- a/configs/xilinx_versal_mini_ospi_defconfig +++ b/configs/xilinx_versal_mini_ospi_defconfig @@ -12,7 +12,6 @@ CONFIG_SF_DEFAULT_SPEED=30000000 CONFIG_ENV_SIZE=0x80 # CONFIG_DM_GPIO is not set CONFIG_DEFAULT_DEVICE_TREE="versal-mini-ospi-single" -CONFIG_SYS_PROMPT="Versal> " CONFIG_SYS_MEM_RSVD_FOR_MMU=y CONFIG_VERSAL_NO_DDR=y # CONFIG_PSCI_RESET is not set @@ -27,6 +26,7 @@ CONFIG_BOARD_EARLY_INIT_R=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set # CONFIG_SYS_LONGHELP is not set +CONFIG_SYS_PROMPT="Versal> " # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set diff --git a/configs/xilinx_versal_mini_qspi_defconfig b/configs/xilinx_versal_mini_qspi_defconfig index 4b07934..39bd267 100644 --- a/configs/xilinx_versal_mini_qspi_defconfig +++ b/configs/xilinx_versal_mini_qspi_defconfig @@ -10,7 +10,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xFFFE0000 CONFIG_SF_DEFAULT_SPEED=30000000 CONFIG_ENV_SIZE=0x80 CONFIG_DEFAULT_DEVICE_TREE="versal-mini-qspi-single" -CONFIG_SYS_PROMPT="Versal> " CONFIG_SYS_MEM_RSVD_FOR_MMU=y CONFIG_VERSAL_NO_DDR=y # CONFIG_PSCI_RESET is not set @@ -27,6 +26,7 @@ CONFIG_BOARD_EARLY_INIT_R=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set # CONFIG_SYS_LONGHELP is not set +CONFIG_SYS_PROMPT="Versal> " # CONFIG_SYS_XTRACE is not set # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/xilinx_versal_net_mini_defconfig b/configs/xilinx_versal_net_mini_defconfig index 346df0c..c33d482 100644 --- a/configs/xilinx_versal_net_mini_defconfig +++ b/configs/xilinx_versal_net_mini_defconfig @@ -13,7 +13,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xBBF10000 CONFIG_ENV_SIZE=0x80 CONFIG_DEFAULT_DEVICE_TREE="versal-net-mini" -CONFIG_SYS_PROMPT="Versal NET> " CONFIG_SYS_MEM_RSVD_FOR_MMU=y # CONFIG_PSCI_RESET is not set CONFIG_SYS_LOAD_ADDR=0xBBF00000 @@ -31,6 +30,7 @@ CONFIG_BOARD_EARLY_INIT_R=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set # CONFIG_SYS_LONGHELP is not set +CONFIG_SYS_PROMPT="Versal NET> " # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set # CONFIG_CMD_BOOTM is not set diff --git a/configs/xilinx_versal_net_mini_emmc_defconfig b/configs/xilinx_versal_net_mini_emmc_defconfig index 6d5affc..1d79eff 100644 --- a/configs/xilinx_versal_net_mini_emmc_defconfig +++ b/configs/xilinx_versal_net_mini_emmc_defconfig @@ -9,7 +9,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x10000 CONFIG_ENV_SIZE=0x80 CONFIG_DEFAULT_DEVICE_TREE="versal-net-mini-emmc" -CONFIG_SYS_PROMPT="Versal NET> " # CONFIG_PSCI_RESET is not set CONFIG_SYS_LOAD_ADDR=0x8000000 # CONFIG_EXPERT is not set @@ -22,6 +21,7 @@ CONFIG_BOARD_EARLY_INIT_R=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set # CONFIG_SYS_LONGHELP is not set +CONFIG_SYS_PROMPT="Versal NET> " # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set diff --git a/configs/xilinx_versal_net_mini_ospi_defconfig b/configs/xilinx_versal_net_mini_ospi_defconfig index d11e180..0656b23 100644 --- a/configs/xilinx_versal_net_mini_ospi_defconfig +++ b/configs/xilinx_versal_net_mini_ospi_defconfig @@ -12,7 +12,6 @@ CONFIG_SF_DEFAULT_SPEED=30000000 CONFIG_ENV_SIZE=0x80 # CONFIG_DM_GPIO is not set CONFIG_DEFAULT_DEVICE_TREE="versal-net-mini-ospi-single" -CONFIG_SYS_PROMPT="Versal NET> " CONFIG_SYS_MEM_RSVD_FOR_MMU=y # CONFIG_PSCI_RESET is not set CONFIG_SYS_LOAD_ADDR=0xBBF80000 @@ -26,6 +25,7 @@ CONFIG_BOARD_EARLY_INIT_R=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set # CONFIG_SYS_LONGHELP is not set +CONFIG_SYS_PROMPT="Versal NET> " # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set diff --git a/configs/xilinx_versal_net_mini_qspi_defconfig b/configs/xilinx_versal_net_mini_qspi_defconfig index a7ebc38..b8736a5 100644 --- a/configs/xilinx_versal_net_mini_qspi_defconfig +++ b/configs/xilinx_versal_net_mini_qspi_defconfig @@ -10,7 +10,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xBBF20000 CONFIG_SF_DEFAULT_SPEED=30000000 CONFIG_ENV_SIZE=0x80 CONFIG_DEFAULT_DEVICE_TREE="versal-net-mini-qspi-single" -CONFIG_SYS_PROMPT="Versal NET> " CONFIG_SYS_MEM_RSVD_FOR_MMU=y # CONFIG_PSCI_RESET is not set CONFIG_SYS_LOAD_ADDR=0xBBF80000 @@ -26,6 +25,7 @@ CONFIG_BOARD_EARLY_INIT_R=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set # CONFIG_SYS_LONGHELP is not set +CONFIG_SYS_PROMPT="Versal NET> " # CONFIG_SYS_XTRACE is not set # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/xilinx_versal_net_virt_defconfig b/configs/xilinx_versal_net_virt_defconfig index 62322af..fc0bb2c 100644 --- a/configs/xilinx_versal_net_virt_defconfig +++ b/configs/xilinx_versal_net_virt_defconfig @@ -6,7 +6,6 @@ CONFIG_ARCH_VERSAL_NET=y CONFIG_TEXT_BASE=0x8000000 CONFIG_SYS_MALLOC_F_LEN=0x100000 CONFIG_DEFAULT_DEVICE_TREE="xilinx-versal-net-virt" -CONFIG_SYS_PROMPT="Versal NET> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_CMD_FRU=y @@ -24,6 +23,7 @@ CONFIG_USE_PREBOOT=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_R=y CONFIG_CLOCKS=y +CONFIG_SYS_PROMPT="Versal NET> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2073 CONFIG_SYS_BOOTM_LEN=0x6400000 diff --git a/configs/xilinx_versal_virt_defconfig b/configs/xilinx_versal_virt_defconfig index 89566c7..388471d 100644 --- a/configs/xilinx_versal_virt_defconfig +++ b/configs/xilinx_versal_virt_defconfig @@ -7,7 +7,6 @@ CONFIG_TEXT_BASE=0x8000000 CONFIG_SYS_MALLOC_F_LEN=0x100000 CONFIG_NR_DRAM_BANKS=36 CONFIG_DEFAULT_DEVICE_TREE="xilinx-versal-virt" -CONFIG_SYS_PROMPT="Versal> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_ENV_OFFSET_REDUND=0x7F00000 @@ -25,6 +24,7 @@ CONFIG_BOOTDELAY=5 CONFIG_USE_PREBOOT=y CONFIG_BOARD_EARLY_INIT_R=y CONFIG_CLOCKS=y +CONFIG_SYS_PROMPT="Versal> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=2073 CONFIG_SYS_BOOTM_LEN=0x6400000 diff --git a/configs/xilinx_zynqmp_r5_defconfig b/configs/xilinx_zynqmp_r5_defconfig index 86674f5..006c536 100644 --- a/configs/xilinx_zynqmp_r5_defconfig +++ b/configs/xilinx_zynqmp_r5_defconfig @@ -7,7 +7,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x1000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-r5" -CONFIG_SYS_PROMPT="ZynqMP r5> " CONFIG_DEBUG_UART_BASE=0xff010000 CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_CPU_FREQ_HZ=500000000 @@ -15,6 +14,7 @@ CONFIG_SYS_LOAD_ADDR=0x0 CONFIG_DEBUG_UART=y CONFIG_BOOTSTAGE=y # CONFIG_DISPLAY_CPUINFO is not set +CONFIG_SYS_PROMPT="ZynqMP r5> " CONFIG_SYS_MAXARGS=32 CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=284 diff --git a/configs/xtfpga_defconfig b/configs/xtfpga_defconfig index 8aae532..cbe7cdb 100644 --- a/configs/xtfpga_defconfig +++ b/configs/xtfpga_defconfig @@ -4,7 +4,6 @@ CONFIG_SYS_MALLOC_LEN=0x40000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SECT_SIZE=0x20000 -CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_MONITOR_LEN=262144 CONFIG_SYS_LOAD_ADDR=0x02000000 CONFIG_ENV_ADDR=0xF7FE0000 @@ -19,6 +18,7 @@ CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_MISC_INIT_R=y CONFIG_SYS_MALLOC_BOOTPARAMS=y CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_PBSIZE=1049 CONFIG_CMD_IMLS=y CONFIG_CMD_ASKENV=y diff --git a/doc/README.ti-secure b/doc/README.ti-secure deleted file mode 100644 index 27c0eaa..0000000 --- a/doc/README.ti-secure +++ /dev/null @@ -1,226 +0,0 @@ -README on how boot images are created for secure TI devices - -CONFIG_TI_SECURE_DEVICE: -Secure TI devices require a boot image that is authenticated by ROM -code to function. Without this, even JTAG remains locked and the -device is essentially useless. In order to create a valid boot image for -a secure device from TI, the initial public software image must be signed -and combined with various headers, certificates, and other binary images. - -Information on the details on the complete boot image format can be obtained -from Texas Instruments. The tools used to generate boot images for secure -devices are part of a secure development package (SECDEV) that can be -downloaded from: - - http://www.ti.com/mysecuresoftware (login required) - -The secure development package is access controlled due to NDA and export -control restrictions. Access must be requested and granted by TI before the -package is viewable and downloadable. Contact TI, either online or by way -of a local TI representative, to request access. - -Booting of U-Boot SPL -===================== - - When CONFIG_TI_SECURE_DEVICE is set, the U-Boot SPL build process - requires the presence and use of these tools in order to create a - viable boot image. The build process will look for the environment - variable TI_SECURE_DEV_PKG, which should be the path of the installed - SECDEV package. If the TI_SECURE_DEV_PKG variable is not defined or - if it is defined but doesn't point to a valid SECDEV package, a - warning is issued during the build to indicate that a final secure - bootable image was not created. - - Within the SECDEV package exists an image creation script: - - ${TI_SECURE_DEV_PKG}/scripts/create-boot-image.sh - - This is called as part of the SPL/u-boot build process. As the secure - boot image formats and requirements differ between secure SOC from TI, - the purpose of this script is to abstract these details as much as - possible. - - The script is basically the only required interface to the TI SECDEV - package for creating a bootable SPL image for secure TI devices. - - Invoking the script for AM33xx Secure Devices - ============================================= - - create-boot-image.sh \ - <IMAGE_FLAG> <INPUT_FILE> <OUTPUT_FILE> <SPL_LOAD_ADDR> - - <IMAGE_FLAG> is a value that specifies the type of the image to - generate OR the action the image generation tool will take. Valid - values are: - SPI_X-LOADER - Generates an image for SPI flash (byte swapped) - X-LOADER - Generates an image for non-XIP flash - MLO - Generates an image for SD/MMC/eMMC media - 2ND - Generates an image for USB, UART and Ethernet - XIP_X-LOADER - Generates a single stage u-boot for NOR/QSPI XiP - - <INPUT_FILE> is the full path and filename of the public world boot - loaderbinary file (depending on the boot media, this is usually - either u-boot-spl.bin or u-boot.bin). - - <OUTPUT_FILE> is the full path and filename of the final secure - image. The output binary images should be used in place of the standard - non-secure binary images (see the platform-specific user's guides and - releases notes for how the non-secure images are typically used) - u-boot-spl_HS_SPI_X-LOADER - byte swapped boot image for SPI flash - u-boot-spl_HS_X-LOADER - boot image for NAND or SD/MMC/eMMC rawmode - u-boot-spl_HS_MLO - boot image for SD/MMC/eMMC media - u-boot-spl_HS_2ND - boot image for USB, UART and Ethernet - u-boot_HS_XIP_X-LOADER - boot image for NOR or QSPI Xip flash - - <SPL_LOAD_ADDR> is the address at which SOC ROM should load the - <INPUT_FILE> - - Invoking the script for AM43xx Secure Devices - ============================================= - - create-boot-image.sh \ - <IMAGE_FLAG> <INPUT_FILE> <OUTPUT_FILE> <SPL_LOAD_ADDR> - - <IMAGE_FLAG> is a value that specifies the type of the image to - generate OR the action the image generation tool will take. Valid - values are: - SPI_X-LOADER - Generates an image for SPI flash (byte - swapped) - XIP_X-LOADER - Generates a single stage u-boot for - NOR/QSPI XiP - ISSW - Generates an image for all other boot modes - - <INPUT_FILE> is the full path and filename of the public world boot - loaderbinary file (depending on the boot media, this is usually - either u-boot-spl.bin or u-boot.bin). - - <OUTPUT_FILE> is the full path and filename of the final secure - image. The output binary images should be used in place of the standard - non-secure binary images (see the platform-specific user's guides and - releases notes for how the non-secure images are typically used) - u-boot-spl_HS_SPI_X-LOADER - byte swapped boot image for SPI flash - u-boot_HS_XIP_X-LOADER - boot image for NOR or QSPI flash - u-boot-spl_HS_ISSW - boot image for all other boot media - - <SPL_LOAD_ADDR> is the address at which SOC ROM should load the - <INPUT_FILE> - - Invoking the script for DRA7xx/AM57xx Secure Devices - ==================================================== - - create-boot-image.sh \ - <IMAGE_TYPE> <INPUT_FILE> <OUTPUT_FILE> <SPL_LOAD_ADDR> - - <IMAGE_TYPE> is a value that specifies the type of the image to - generate OR the action the image generation tool will take. Valid - values are: - X-LOADER - Generates an image for NOR or QSPI boot modes - MLO - Generates an image for SD/MMC/eMMC boot modes - ULO - Generates an image for USB/UART peripheral boot modes - - <INPUT_FILE> is the full path and filename of the public world boot - loader binary file (for this platform, this is always u-boot-spl.bin). - - <OUTPUT_FILE> is the full path and filename of the final secure image. - The output binary images should be used in place of the standard - non-secure binary images (see the platform-specific user's guides - and releases notes for how the non-secure images are typically used) - u-boot-spl_HS_MLO - boot image for SD/MMC/eMMC. This image is - copied to a file named MLO, which is the name that - the device ROM bootloader requires for loading from - the FAT partition of an SD card (same as on - non-secure devices) - u-boot-spl_HS_ULO - boot image for USB/UART peripheral boot modes - u-boot-spl_HS_X-LOADER - boot image for all other flash memories - including QSPI and NOR flash - - <SPL_LOAD_ADDR> is the address at which SOC ROM should load the - <INPUT_FILE> - - Invoking the script for Keystone2 Secure Devices - ================================================ - - create-boot-image.sh \ - <UNUSED> <INPUT_FILE> <OUTPUT_FILE> <UNUSED> - - <UNUSED> is currently ignored and reserved for future use. - - <INPUT_FILE> is the full path and filename of the public world boot - loader binary file (only u-boot.bin is currently supported on - Keystone2 devices, u-boot-spl.bin is not currently supported). - - <OUTPUT_FILE> is the full path and filename of the final secure image. - The output binary images should be used in place of the standard - non-secure binary images (see the platform-specific user's guides - and releases notes for how the non-secure images are typically used) - u-boot_HS_MLO - signed and encrypted boot image that can be used to - boot from all media. Secure boot from SPI NOR flash is not - currently supported. - - Invoking the script for K3 Secure Devices - ========================================= - - The signing steps required to produce a bootable SPL image on secure - K3 TI devices are the same as those performed on non-secure devices. - The only difference is the key is not checked on non-secure devices so - a dummy key is used when building U-Boot for those devices. For secure - K3 TI devices simply use the real hardware key for your device. This - real key can be set with the Kconfig option "K3_KEY". The environment - variable TI_SECURE_DEV_PKG is also searched for real keys when the - build targets secure devices. - -Booting of Primary U-Boot (u-boot.img) -====================================== - - The SPL image is responsible for loading the next stage boot loader, - which is the main u-boot image. For secure TI devices, the SPL will - be authenticated, as described above, as part of the particular - device's ROM boot process. In order to continue the secure boot - process, the authenticated SPL must authenticate the main u-boot - image that it loads. - - The configurations for secure TI platforms are written to make the boot - process use the FIT image format for the u-boot.img (CONFIG_SPL_FRAMEWORK - and CONFIG_SPL_LOAD_FIT). With these configurations the binary - components that the SPL loads include a specific DTB image and u-boot - image. These DTB image may be one of many available to the boot - process. In order to secure these components so that they can be - authenticated by the SPL as they are loaded from the FIT image, the - build procedure for secure TI devices will secure these images before - they are integrated into the FIT image. When those images are extracted - from the FIT image at boot time, they are post-processed to verify that - they are still secure. The outlined security-related SPL post-processing - is enabled through the CONFIG_SPL_FIT_IMAGE_POST_PROCESS option which - must be enabled for the secure boot scheme to work. In order to allow - verifying proper operation of the secure boot chain in case of successful - authentication messages like "Authentication passed" are output by the - SPL to the console for each blob that got extracted from the FIT image. - - The exact details of the how the images are secured is handled by the - SECDEV package. Within the SECDEV package exists a script to process - an input binary image: - - ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh - - This is called as part of the u-boot build process. As the secure - image formats and requirements can differ between the various secure - SOCs from TI, this script in the SECDEV package abstracts these - details. This script is essentially the only required interface to the - TI SECDEV package for creating a u-boot.img image for secure TI - devices. - - The SPL/u-boot code contains calls to dedicated secure ROM functions - to perform the validation on the secured images. The details of the - interface to those functions is shown in the code. The summary - is that they are accessed by invoking an ARM secure monitor call to - the device's secure ROM (fixed read-only-memory that is secure and - only accessible when the ARM core is operating in the secure mode). - - Invoking the secure-binary-image script for Secure Devices - ========================================================== - - secure-binary-image.sh <INPUT_FILE> <OUTPUT_FILE> - - <INPUT_FILE> is the full path and filename of the input binary image - - <OUTPUT_FILE> is the full path and filename of the output secure image. diff --git a/doc/SPI/README.ti_qspi_am43x_test b/doc/SPI/README.ti_qspi_am43x_test deleted file mode 100644 index 8fbf10b..0000000 --- a/doc/SPI/README.ti_qspi_am43x_test +++ /dev/null @@ -1,76 +0,0 @@ -Testing details- ----------------- - -This doc simply illustrated the testing details of qspi flash -driver with Macronix M25L51235 flash device. - -The test includes -- probing the flash device -- erasing the flash device -- Writing to flash -- Reading the contents of the flash. - -Test Log --------- - -Hit any key to stop autoboot: 0 -U-Boot# sf probe 0 -SF: Detected MX25L51235F with page size 256 Bytes, erase size 64 KiB, total 64 MiB, mapped at 30000000 -U-Boot# sf erase 0 0x80000 -SF: 524288 bytes @ 0x0 Erased: OK -U-Boot# mw 81000000 0xdededede 0x40000 -U-Boot# sf write 81000000 0 0x40000 -SF: 262144 bytes @ 0x0 Written: OK -U-Boot# sf read 82000000 0 0x40000 -SF: 262144 bytes @ 0x0 Read: OK -U-Boot# md 0x82000000 -82000000: dededede dededede dededede dededede ................ -82000010: dededede dededede dededede dededede ................ -82000020: dededede dededede dededede dededede ................ -82000030: dededede dededede dededede dededede ................ -82000040: dededede dededede dededede dededede ................ -82000050: dededede dededede dededede dededede ................ -82000060: dededede dededede dededede dededede ................ -82000070: dededede dededede dededede dededede ................ -82000080: dededede dededede dededede dededede ................ -82000090: dededede dededede dededede dededede ................ -820000a0: dededede dededede dededede dededede ................ -820000b0: dededede dededede dededede dededede ................ -820000c0: dededede dededede dededede dededede ................ -820000d0: dededede dededede dededede dededede ................ -820000e0: dededede dededede dededede dededede ................ -820000f0: dededede dededede dededede dededede ................ -U-Boot# md 0x82010000 -82010000: dededede dededede dededede dededede ................ -82010010: dededede dededede dededede dededede ................ -82010020: dededede dededede dededede dededede ................ -82010030: dededede dededede dededede dededede ................ -82010040: dededede dededede dededede dededede ................ -82010050: dededede dededede dededede dededede ................ -82010060: dededede dededede dededede dededede ................ -82010070: dededede dededede dededede dededede ................ -82010080: dededede dededede dededede dededede ................ -82010090: dededede dededede dededede dededede ................ -820100a0: dededede dededede dededede dededede ................ -820100b0: dededede dededede dededede dededede ................ -820100c0: dededede dededede dededede dededede ................ -820100d0: dededede dededede dededede dededede ................ -820100e0: dededede dededede dededede dededede ................ -820100f0: dededede dededede dededede dededede ................ -U-Boot# md 0x82030000 -82030000: dededede dededede dededede dededede ................ -82030010: dededede dededede dededede dededede ................ -82030020: dededede dededede dededede dededede ................ -82030030: dededede dededede dededede dededede ................ -82030040: dededede dededede dededede dededede ................ -82030050: dededede dededede dededede dededede ................ -82030060: dededede dededede dededede dededede ................ -82030070: dededede dededede dededede dededede ................ -82030080: dededede dededede dededede dededede ................ -82030090: dededede dededede dededede dededede ................ -820300a0: dededede dededede dededede dededede ................ -820300b0: dededede dededede dededede dededede ................ -820300c0: dededede dededede dededede dededede ................ -820300d0: dededede dededede dededede dededede ................ -820300e0: dededede dededede dededede dededede ................ -820300f0: dededede dededede dededede dededede ................ diff --git a/doc/SPI/README.ti_qspi_dra_test b/doc/SPI/README.ti_qspi_dra_test deleted file mode 100644 index e89f535..0000000 --- a/doc/SPI/README.ti_qspi_dra_test +++ /dev/null @@ -1,47 +0,0 @@ -------------------------------------------------- - Simple steps used to test the QSPI at U-Boot -------------------------------------------------- - -For #1, build the patched U-Boot and load MLO/u-boot.img - ----------------------------------- -Boot from another medium like MMC ----------------------------------- - -U-Boot# mmc dev 0 -mmc0 is current device -U-Boot# fatload mmc 0 0x82000000 MLO -reading MLO -55872 bytes read in 8 ms (6.7 MiB/s) -U-Boot# fatload mmc 0 0x83000000 u-boot.img -reading u-boot.img -248600 bytes read in 19 ms (12.5 MiB/s) - --------------------------------------------------- -Commands to erase/write u-boot/mlo to flash device --------------------------------------------------- -U-Boot# sf probe 0 -SF: Detected S25FL256S_64K with page size 256 Bytes, erase size 64 KiB, total 32 MiB, mapped at 5c000000 -U-Boot# sf erase 0 0x10000 -SF: 65536 bytes @ 0x0 Erased: OK -U-Boot# sf erase 0x20000 0x10000 -SF: 65536 bytes @ 0x20000 Erased: OK -U-Boot# sf erase 0x30000 0x10000 -SF: 65536 bytes @ 0x30000 Erased: OK -U-Boot# sf erase 0x40000 0x10000 -SF: 65536 bytes @ 0x40000 Erased: OK -U-Boot# sf erase 0x50000 0x10000 -SF: 65536 bytes @ 0x50000 Erased: OK -U-Boot# sf erase 0x60000 0x10000 -SF: 65536 bytes @ 0x60000 Erased: OK -U-Boot# sf write 82000000 0 0x10000 -SF: 65536 bytes @ 0x0 Written: OK -U-Boot# sf write 83000000 0x20000 0x60000 -SF: 393216 bytes @ 0x20000 Written: OK - -For #2, set sysboot to QSPI-1 boot mode(SYSBOOT[5:0] = 100110) and power -on. ROM should find the GP header at offset 0 and load/execute SPL. SPL -then detects that ROM was in QSPI-1 mode (boot code 10) and attempts to -find a U-Boot image header at offset 0x20000 (set in the config file) -and proceeds to load that image using the U-Boot image payload offset/size -from the header. It will then start U-Boot. diff --git a/doc/SPI/README.ti_qspi_flash b/doc/SPI/README.ti_qspi_flash deleted file mode 100644 index 5cc1fd0..0000000 --- a/doc/SPI/README.ti_qspi_flash +++ /dev/null @@ -1,47 +0,0 @@ -QSPI U-Boot support ------------------- - -Host processor is connected to serial flash device via qpsi -interface. QSPI is a kind of spi module that allows single, -dual and quad read access to external spi devices. The module -has a memory mapped interface which provide direct interface -for accessing data form external spi devices. - -The one QSPI in the device is primarily intended for fast booting -from Quad SPI flash devices. - -Usecase -------- - -MLO/u-boot.img will be flashed from SD/MMC to the flash device -using serial flash erase and write commands. Then, switch settings -will be changed to qspi boot. Then, the ROM code will read MLO -from the predefined location in the flash, where it was flashed and -execute it after storing it in SDRAM. Then, the MLO will read -u-boot.img from flash and execute it from SDRAM. - -SPI mode -------- -SPI mode uses mtd spi framework for transfer and reception of data. -Can be used in: -1. Normal mode: use single pin for transfers -2. Dual Mode: use two pins for transfers. -3. Quad mode: use four pin for transfer - -Memory mapped read mode ------------------------ -In this, SPI controller is configured using configuration port and then -controller is switched to memory mapped port for data read. - -Driver ------- -drivers/qspi/ti_qspi.c - - Newly created file which is responsible for configuring the - qspi controller and also for providing the low level api which - is responsible for transferring the datas from host controller - to flash device and vice versa. - -Testing -------- -A seperated file named README.dra_qspi_test has been created which gives all the -details about the commands required to test qspi at U-Boot level. diff --git a/doc/board/emulation/qemu-arm.rst b/doc/board/emulation/qemu-arm.rst index 78bcc3e..1c91c7f 100644 --- a/doc/board/emulation/qemu-arm.rst +++ b/doc/board/emulation/qemu-arm.rst @@ -189,7 +189,7 @@ In a second console invoke qemu-system-aarch64 with:: Enable the TPM on U-Boot's command line with:: - tpm2 startup TPM2_SU_CLEAR + tpm autostart Debug UART ---------- diff --git a/doc/board/google/chromebook_coral.rst b/doc/board/google/chromebook_coral.rst index 23e2db4..1eda769 100644 --- a/doc/board/google/chromebook_coral.rst +++ b/doc/board/google/chromebook_coral.rst @@ -88,7 +88,7 @@ Here is the console output:: Net: No ethernet found. SF: Detected w25q128fw with page size 256 Bytes, erase size 4 KiB, total 16 MiB Hit any key to stop autoboot: 0 - cmdline=console= loglevel=7 init=/sbin/init cros_secure oops=panic panic=-1 root=PARTUUID=${uuid}/PARTNROFF=1 rootwait rw dm_verity.error_behavior=3 dm_verity.max_bios=-1 dm_verity.dev_wait=0 dm="1 vroot none rw 1,0 3788800 verity payload=ROOT_DEV hashtree=HASH_DEV hashstart=3788800 alg=sha1 root_hexdigest=55052b629d3ac889f25a9583ea12cdcd3ea15ff8 salt=a2d4d9e574069f4fed5e3961b99054b7a4905414b60a25d89974a7334021165c" noinitrd vt.global_cursor_default=0 kern_guid=${uuid} add_efi_memmap boot=local noresume noswap i915.modeset=1 Kernel command line: "console= loglevel=7 init=/sbin/init cros_secure oops=panic panic=-1 root=PARTUUID=35c775e7-3735-d745-93e5-d9e0238f7ed0/PARTNROFF=1 rootwait rw dm_verity.error_behavior=3 dm_verity.max_bios=-1 dm_verity.dev_wait=0 dm="1 vroot none rw 1,0 3788800 verity payload=ROOT_DEV hashtree=HASH_DEV hashstart=3788800 alg=sha1 root_hexdigest=55052b629d3ac889f25a9583ea12cdcd3ea15ff8 salt=a2d4d9e574069f4fed5e3961b99054b7a4905414b60a25d89974a7334021165c" noinitrd vt.global_cursor_default=0 kern_guid=35c775e7-3735-d745-93e5-d9e0238f7ed0 add_efi_memmap boot=local noresume noswap i915.modeset=1 tpm_tis.force=1 tpm_tis.interrupts=0 nmi_watchdog=panic,lapic disablevmx=off " + cmdline=console= loglevel=7 init=/sbin/init cros_secure oops=panic panic=-1 root=PARTUUID=${uuid}/PARTNROFF=1 rootwait rw dm_verity.error_behavior=3 dm_verity.max_bios=-1 dm_verity.dev_wait=0 dm="1 vroot none rw 1,0 3788800 verity payload=ROOT_DEV hashtree=HASH_DEV hashstart=3788800 alg=sha1 root_hexdigest=55052b629d3ac889f25a9583ea12cdcd3ea15ff8 salt=a2d4d9e574069f4fed5e3961b99054b7a4905414b60a25d89974a7334021165c" noinitrd vt.global_cursor_default=0 kern_guid=${uuid} add_efi_memmap noresume i915.modeset=1 Kernel command line: "console= loglevel=7 init=/sbin/init cros_secure oops=panic panic=-1 root=PARTUUID=35c775e7-3735-d745-93e5-d9e0238f7ed0/PARTNROFF=1 rootwait rw dm_verity.error_behavior=3 dm_verity.max_bios=-1 dm_verity.dev_wait=0 dm="1 vroot none rw 1,0 3788800 verity payload=ROOT_DEV hashtree=HASH_DEV hashstart=3788800 alg=sha1 root_hexdigest=55052b629d3ac889f25a9583ea12cdcd3ea15ff8 salt=a2d4d9e574069f4fed5e3961b99054b7a4905414b60a25d89974a7334021165c" noinitrd vt.global_ Setup located at 00090000: ACPI RSDP addr : 7991f000 @@ -136,7 +136,7 @@ Here is the console output:: Ext loader ver : 0 Ext loader type : 0 Command line ptr : 99000 - console= loglevel=7 init=/sbin/init cros_secure oops=panic panic=-1 root=PARTUUID=35c775e7-3735-d745-93e5-d9e0238f7ed0/PARTNROFF=1 rootwait rw dm_verity.error_behavior=3 dm_verity.max_bios=-1 dm_verity.dev_wait=0 dm="1 vroot none rw 1,0 3788800 verity payload=ROOT_DEV hashtree=HASH_DEV hashstart=3788800 alg=sha1 root_hexdigest=55052b629d3ac889f25a9583ea12cdcd3ea15ff8 salt=a2d4d9e574069f4fed5e3961b99054b7a4905414b60a25d89974a7334021165c" noinitrd vt.global_cursor_default=0 kern_guid=35c775e7-3735-d745-93e5-d9e0238f7ed0 add_efi_memmap boot=local noresume noswap i915.modeset=1 tpm_tis.force=1 tpm_tis.interrupts=0 nmi_watchdog=panic,lapic disablevmx=off + console= loglevel=7 init=/sbin/init cros_secure oops=panic panic=-1 root=PARTUUID=35c775e7-3735-d745-93e5-d9e0238f7ed0/PARTNROFF=1 rootwait rw dm_verity.error_behavior=3 dm_verity.max_bios=-1 dm_verity.dev_wait=0 dm="1 vroot none rw 1,0 3788800 verity payload=ROOT_DEV hashtree=HASH_DEV hashstart=3788800 alg=sha1 root_hexdigest=55052b629d3ac889f25a9583ea12cdcd3ea15ff8 salt=a2d4d9e574069f4fed5e3961b99054b7a4905414b60a25d89974a7334021165c" noinitrd vt.global_cursor_default=0 kern_guid=35c775e7-3735-d745-93e5-d9e0238f7ed0 add_efi_memmap noresume i915.modeset=1 tpm_tis.force=1 tpm_tis.interrupts=0 nmi_watchdog=panic,lapic disablevmx=off Initrd addr max : 7fffffff Kernel alignment : 200000 Relocatable kernel : 1 diff --git a/doc/board/index.rst b/doc/board/index.rst index 0194f0a..35dd3bc 100644 --- a/doc/board/index.rst +++ b/doc/board/index.rst @@ -32,7 +32,6 @@ Board-specific doc lg/index mediatek/index microchip/index - nokia/index nxp/index openpiton/index phytec/index diff --git a/doc/board/nokia/index.rst b/doc/board/nokia/index.rst deleted file mode 100644 index b68c3c6..0000000 --- a/doc/board/nokia/index.rst +++ /dev/null @@ -1,9 +0,0 @@ -.. SPDX-License-Identifier: GPL-2.0+ - -Nokia -===== - -.. toctree:: - :maxdepth: 2 - - rx51 diff --git a/doc/board/nokia/rx51.rst b/doc/board/nokia/rx51.rst deleted file mode 100644 index 93502e2..0000000 --- a/doc/board/nokia/rx51.rst +++ /dev/null @@ -1,250 +0,0 @@ -.. SPDX-License-Identifier: GPL-2.0+ - -Nokia RX-51 aka N900 -==================== - -The ``nokia_rx51_defconfig`` configuration file results in a ``u-boot.bin`` -which can be chainloaded by the Nokia second stage bootloader (NOLO) in QEMU or -on a real N900. It does very little hardware configuration because NOLO has -already configured the board. It is only needed to enable the internal eMMC -memory via the twl4030 regulator which is not enabled by NOLO. - -.. code-block:: bash - - make CROSS_COMPILE=arm-linux-gnueabi- nokia_rx51_defconfig u-boot.bin - -NOLO is expecting a kernel image and will treat any image it finds in -OneNAND as such. This u-boot is intended to be flashed to the N900 like -a kernel. In order to transparently boot the original kernel, it will be -appended to ``u-boot.bin`` at 0x40000. NOLO will load the entire image into -(random) memory and execute U-Boot, which saves hardware revision, boot reason -and boot mode ATAGs set by NOLO. Then the bootscripts will attempt to load -``uImage``, ``zImage`` or ``boot.scr`` file from a FAT or ext2/3/4 filesystem -on external SD card or internal eMMC memory. If this fails or keyboard is -closed then the appended kernel image will be booted using some generated -and some stored ATAGs (see boot order). - -For generating combined image of U-Boot and kernel (either in uImage or zImage -format) there is a simple script called ``u-boot-gen-combined``. It is available -in following repository: https://github.com/pali/u-boot-maemo. - -To generate the ``combined.bin`` image from ``u-boot.bin`` and ``kernel.bin`` -(in either uImage or zImage format) use: - -.. code-block:: bash - - sh u-boot-gen-combined u-boot.bin kernel.bin combined.bin - -The original Maemo Fremantle PR1.3 zImage kernel binary is available at: -http://repository.maemo.org/pool/maemo5.0/free/k/kernel/kernel_2.6.28-20103103+0m5_armel.deb - -To unpack it (from DEB/AR, TAR and FIASCO) execute the following commands: - -.. code-block:: bash - - ar x kernel_2.6.28-20103103+0m5_armel.deb data.tar.gz - tar -O -xf data.tar.gz ./boot/zImage-2.6.28-20103103+0m5.fiasco > kernel_2.6.28-20103103+0m5.fiasco - 0xFFFF -M kernel_2.6.28-20103103+0m5.fiasco -u - -The flashed image must start with a 2 KiB ``NOLO!img`` header which contains -size of the image. The header consists of the bytes -``NOLO!img\x02\x00\x00\x00\x00\x00\x00\x00`` followed by the 4 byte little -endian size of the image. The rest of the 2 KiB header just contains zero bytes. - -The Nokia proprietary flasher and also the open source 0xFFFF flasher -automatically prepend the required ``NOLO!img`` header and both applications -expect that the image does not contain a ``NOLO!img`` header. Adding a -``NOLO!img`` header is required only in case of using the ``nandwrite`` tool for -flashing. - -The open source 0xFFFF flasher is available in the following repository: -https://github.com/pali/0xFFFF - -It is possible to load ``u-boot.bin`` via USB to the N900 RAM and boot it -without needing to flash it. This is done via 0xFFFF running on the host PC: - -.. code-block:: bash - - 0xFFFF -m u-boot.bin -l -b - -0xFFFF also supports flashing a kernel image either via USB or directly on -N900 device. Flashing u-boot/kernel/combined image is done as: - -.. code-block:: bash - - 0xFFFF -m combined.bin -f - -Via 0xFFFF it is also possible to generate a standard flashable image in -Nokia FIASCO format which contains metadata information like device -identification (RX-51) and version string (v2021.04): - -.. code-block:: bash - - 0xFFFF -m RX-51:v2021.04:kernel:u-boot.bin -g u-boot.fiasco - -There is support for the hardware watchdog. The hardware watchdog is started by -NOLO so U-Boot must reset the watchdog to prevent rebooting the device (but not -very often, max every 2 seconds). There is also support for framebuffer display -output with ANSI escape codes and the N900 hardware keyboard input. - -When U-Boot is starting it sets the IBE bit in the Auxiliary Control Register, -which is needed for Thumb-2 ISA support. This is a workaround for erratum -430973. - -Default boot order ------------------- - -0. if keyboard is closed boot automatically attached kernel image -1. try boot from external SD card -2. try boot from internal eMMC memory -3. try boot from attached kernel image - -Boot from SD or eMMC in this order: - -1. boot from FAT partition - - a. find ``boot.scr`` on first FAT partition - b. find ``uImage`` on first FAT partition - c. find ``zImage`` on first FAT partition - d. same order for 2nd - 4th FAT partition - -2. same as 1. but for ext2/3/4 partition - -Available additional commands/variables ---------------------------------------- - -* run sdboot - Boot from external SD card (see boot order) -* run emmcboot - Boot from internal eMMC memory (see boot order) -* run attachboot - Boot attached kernel image (attached to U-Boot binary) - -\ - -* run scriptload - Load boot script ``${mmcscriptfile}`` -* run scriptboot - Run loaded boot script -* run kernload - Load kernel image ``${mmckernfile}`` -* run initrdload - Load initrd image ``${mmcinitrdfile}`` -* run kernboot - Boot loaded kernel image -* run kerninitrdboot - Boot loaded kernel image with loaded initrd image - -\ - -* run trymmcscriptboot - Try to load and boot script ``${mmcscriptfile}`` -* run trymmckernboot - Try to load and boot kernel image ``${mmckernfile}`` -* run trymmckerninitrdboot - Try to load and boot kernel image ``${mmckernfile}`` - with initrd image ``${mmcinitrdfile}`` - -Additional variables for loading files from mmc ------------------------------------------------ - -* mmc ``${mmcnum}`` (0 - external, 1 - internal) -* partition number ``${mmcpart}`` (1 - 4) -* partition type ``${mmctype}`` (fat, ext2, ext4; ext2 is just alias for ext4) - -Additional variables for booting a kernel ------------------------------------------ - -* ``setup_omap_atag`` - Add OMAP table into atags structure (needed for maemo kernel) -* ``setup_console_atag`` - Enable serial console in OMAP table -* ``setup_boot_reason_atag`` - Change boot reason in OMAP table -* ``setup_boot_mode_atag`` - Change boot mode in OMAP table - -Variable ``setup_omap_atag`` is automatically set when booting attached kernel. -When variable ``setup_omap_atag`` is set, variable ``setup_console_atag`` is unset -and u-boot standard output is set to serial then ``setup_console_atag`` is -automatically set to 1. So output from Maemo kernel would go to serial port. - -UBIFS support -------------- - -UBIFS support is disabled, because U-Boot image is too big and cannot be -flashed with attached kernel image to RX-51 kernel nand area. For enabling -UBIFS support add following lines into file ``configs/nokia_rx51_defconfig``:: - - CONFIG_CMD_UBI=y - CONFIG_CMD_UBIFS=y - CONFIG_MTD_UBI_BEB_LIMIT=10 - -Early output ------------- - -Early U-Boot output can be enabled on serial console by adding following lines -into file ``configs/nokia_rx51_defconfig``:: - - CONFIG_DEBUG_UART=y - CONFIG_DEBUG_UART_OMAP=y - CONFIG_DEBUG_UART_SHIFT=2 - CONFIG_DEBUG_UART_BASE=0x49020000 - CONFIG_DEBUG_UART_CLOCK=48000000 - -Note that early output is not available on USB tty console. - -Verbose debug output --------------------- - -Verbose debug output with maximal log level can be enabled by adding following -lines into file ``configs/nokia_rx51_defconfig``:: - - CONFIG_DM_DEBUG=y - CONFIG_LOG=y - CONFIG_LOGLEVEL=9 - CONFIG_LOG_MAX_LEVEL=9 - CONFIG_LOG_DEFAULT_LEVEL=9 - -And compiling U-Boot by additional make parameter ``KCPPFLAGS=-DLOG_DEBUG``. - -Run in QEMU ------------ - -Download and compile Linaro version of qemu which contains ``n900`` qemu -machine. Source code is available in qemu-linaro git repository and the -last working version is at commit 8f8d8e0796efe1a6f34cdd83fb798f3c41217ec1. - -Use following commands to compile ``qemu-system-arm`` binary with ``n900`` -qemu machine support: - -.. code-block:: bash - - git clone https://git.linaro.org/qemu/qemu-linaro.git - cd qemu-linaro - git checkout 8f8d8e0796efe1a6f34cdd83fb798f3c41217ec1 - ./configure --enable-system --target-list=arm-softmmu --disable-werror - make -j4 - cd .. - ln -s qemu-linaro/arm-softmmu/qemu-system-arm . - -Using ``n900`` qemu machine requires proprietary Nokia qemu ``qflasher`` tool -(in reality it is just generator of qemu MTD images) with first stage images -(``xloader-qemu.bin`` and ``secondary-qemu.bin``), similar what is required -on the real HW. License of flasher and images allows non-commercial -redistribution and it is available at maemo.org website: - -.. code-block:: bash - - wget -c http://repository.maemo.org/qemu-n900/qemu-n900.tar.gz - tar -xf qemu-n900.tar.gz - -To generate qemu bootable MTD image ``mtd.img`` from U-Boot binary -``u-boot.bin`` and unpacked first stage images, run following command: - -.. code-block:: bash - - ./qflasher -v -x xloader-qemu.bin -s secondary-qemu.bin -k u-boot.bin -m rx51 -o mtd.img - -Instead of ``u-boot.bin`` binary it is possible to also used combined -U-Boot + kernel binary ``combined.bin``. - -Finally, to boot ``mtd.img`` with graphics display and keyboard with optional -serial console on current terminal, run: - -.. code-block:: bash - - ./qemu-system-arm -M n900 -mtdblock mtd.img -serial /dev/tty - -Additionally it is possible to emulate also eMMC and uSD card by appending -qemu ``-sd`` arguments: - -.. code-block:: bash - - ./qemu-system-arm -M n900 -mtdblock mtd.img -sd emmc.img -sd sd.img -serial /dev/tty - -For more examples, look into the ``test/nokia_rx51_test.sh`` CI testing script. diff --git a/doc/board/starfive/visionfive2.rst b/doc/board/starfive/visionfive2.rst index f5575ab..9ee758e 100644 --- a/doc/board/starfive/visionfive2.rst +++ b/doc/board/starfive/visionfive2.rst @@ -20,6 +20,8 @@ The support for following drivers are already enabled: 3. StarFive JH7110 reset Driver. 4. Cadence QSPI controller Driver. 5. MMC SPI Driver for MMC/SD support. +6. PLDA PCIE controller driver. +7. On-board VL805 PCIE-USB controller driver. Booting from MMC using U-Boot SPL --------------------------------- diff --git a/doc/board/ti/am335x_evm.rst b/doc/board/ti/am335x_evm.rst index 3332d51..2ba651e 100644 --- a/doc/board/ti/am335x_evm.rst +++ b/doc/board/ti/am335x_evm.rst @@ -43,6 +43,180 @@ to look at both `include/configs/am335x_evm.h`, `include/configs/ti_am335x_common.h` and `include/configs/am335x_evm.h` as the migration to Kconfig is not yet complete. +Secure Boot +----------- + +.. secure_boot_include_start_config_ti_secure_device + +Secure TI devices require a boot image that is authenticated by ROM +code to function. Without this, even JTAG remains locked and the +device is essentially useless. In order to create a valid boot image for +a secure device from TI, the initial public software image must be signed +and combined with various headers, certificates, and other binary images. + +Information on the details on the complete boot image format can be obtained +from Texas Instruments. The tools used to generate boot images for secure +devices are part of a secure development package (SECDEV) that can be +downloaded from: + + http://www.ti.com/mysecuresoftware (login required) + +The secure development package is access controlled due to NDA and export +control restrictions. Access must be requested and granted by TI before the +package is viewable and downloadable. Contact TI, either online or by way +of a local TI representative, to request access. + +.. secure_boot_include_end_config_ti_secure_device + +.. secure_boot_include_start_spl_boot + +1. Booting of U-Boot SPL +^^^^^^^^^^^^^^^^^^^^^^^^ + +When CONFIG_TI_SECURE_DEVICE is set, the U-Boot SPL build process +requires the presence and use of these tools in order to create a +viable boot image. The build process will look for the environment +variable TI_SECURE_DEV_PKG, which should be the path of the installed +SECDEV package. If the TI_SECURE_DEV_PKG variable is not defined or +if it is defined but doesn't point to a valid SECDEV package, a +warning is issued during the build to indicate that a final secure +bootable image was not created. + +Within the SECDEV package exists an image creation script: + +.. prompt:: bash + :prompts: $ + + ${TI_SECURE_DEV_PKG}/scripts/create-boot-image.sh + +This is called as part of the SPL/u-boot build process. As the secure +boot image formats and requirements differ between secure SOC from TI, +the purpose of this script is to abstract these details as much as +possible. + +The script is basically the only required interface to the TI SECDEV +package for creating a bootable SPL image for secure TI devices. + +.. prompt:: bash + :prompts: $ + + create-boot-image.sh \ + <IMAGE_FLAG> <INPUT_FILE> <OUTPUT_FILE> <SPL_LOAD_ADDR> + +.. secure_boot_include_end_spl_boot + +<IMAGE_FLAG> is a value that specifies the type of the image to +generate OR the action the image generation tool will take. Valid +values are: + +.. list-table:: + :widths: 25 25 + :header-rows: 0 + + * - PI_X-LOADER + - Generates an image for SPI flash (byte swapped) + * - X-LOADER + - Generates an image for non-XIP flash + * - MLO + - Generates an image for SD/MMC/eMMC media + * - 2ND + - Generates an image for USB, UART and Ethernet + * - XIP_X-LOADER + - Generates a single stage u-boot for NOR/QSPI XiP + +<INPUT_FILE> is the full path and filename of the public world boot +loaderbinary file (depending on the boot media, this is usually +either u-boot-spl.bin or u-boot.bin). + +<OUTPUT_FILE> is the full path and filename of the final secure +image. The output binary images should be used in place of the standard +non-secure binary images (see the platform-specific user's guides and +releases notes for how the non-secure images are typically used) + +.. list-table:: + :widths: 25 25 + :header-rows: 0 + + * - u-boot-spl_HS_SPI_X-LOADER + - byte swapped boot image for SPI flash + * - u-boot-spl_HS_X-LOADER + - boot image for NAND or SD/MMC/eMMC rawmode + * - u-boot-spl_HS_MLO + - boot image for SD/MMC/eMMC media + * - u-boot-spl_HS_2ND + - boot image for USB, UART and Ethernet + * - u-boot_HS_XIP_X-LOADER + - boot image for NOR or QSPI Xip flash + +<SPL_LOAD_ADDR> is the address at which SOC ROM should load the +<INPUT_FILE> + +.. secure_boot_include_start_primary_u_boot + +2. Booting of Primary U-Boot (u-boot.img) +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +The SPL image is responsible for loading the next stage boot loader, +which is the main u-boot image. For secure TI devices, the SPL will +be authenticated, as described above, as part of the particular +device's ROM boot process. In order to continue the secure boot +process, the authenticated SPL must authenticate the main u-boot +image that it loads. + +The configurations for secure TI platforms are written to make the boot +process use the FIT image format for the u-boot.img (CONFIG_SPL_FRAMEWORK +and CONFIG_SPL_LOAD_FIT). With these configurations the binary +components that the SPL loads include a specific DTB image and u-boot +image. These DTB image may be one of many available to the boot +process. In order to secure these components so that they can be +authenticated by the SPL as they are loaded from the FIT image, the +build procedure for secure TI devices will secure these images before +they are integrated into the FIT image. When those images are extracted +from the FIT image at boot time, they are post-processed to verify that +they are still secure. The outlined security-related SPL post-processing +is enabled through the CONFIG_SPL_FIT_IMAGE_POST_PROCESS option which +must be enabled for the secure boot scheme to work. In order to allow +verifying proper operation of the secure boot chain in case of successful +authentication messages like "Authentication passed" are output by the +SPL to the console for each blob that got extracted from the FIT image. + +The exact details of the how the images are secured is handled by the +SECDEV package. Within the SECDEV package exists a script to process +an input binary image: + +.. prompt:: bash + :prompts: $ + + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh + +This is called as part of the u-boot build process. As the secure +image formats and requirements can differ between the various secure +SOCs from TI, this script in the SECDEV package abstracts these +details. This script is essentially the only required interface to the +TI SECDEV package for creating a u-boot.img image for secure TI +devices. + +The SPL/u-boot code contains calls to dedicated secure ROM functions +to perform the validation on the secured images. The details of the +interface to those functions is shown in the code. The summary +is that they are accessed by invoking an ARM secure monitor call to +the device's secure ROM (fixed read-only-memory that is secure and +only accessible when the ARM core is operating in the secure mode). + +Invoking the secure-binary-image script for Secure Devices +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +.. prompt:: bash + :prompts: $ + + secure-binary-image.sh <INPUT_FILE> <OUTPUT_FILE> + +<INPUT_FILE> is the full path and filename of the input binary image + +<OUTPUT_FILE> is the full path and filename of the output secure image. + +.. secure_boot_include_end_primary_u_boot + NAND ---- @@ -52,41 +226,53 @@ inserted with the files to write in the first SD slot and that mtdparts have been configured correctly for the board. All images are first loaded into memory, then written to NAND. -Step-1: Building u-boot for NAND boot - Set following CONFIGxx options for NAND device. - CONFIG_SYS_NAND_PAGE_SIZE number of main bytes in NAND page - CONFIG_SYS_NAND_OOBSIZE number of OOB bytes in NAND page - CONFIG_SYS_NAND_BLOCK_SIZE number of bytes in NAND erase-block - CFG_SYS_NAND_ECCPOS ECC map for NAND page - CONFIG_NAND_OMAP_ECCSCHEME (refer doc/README.nand) - -Step-2: Flashing NAND via MMC/SD - -.. code-block:: text - - # select BOOTSEL to MMC/SD boot and boot from MMC/SD card - U-Boot # mmc rescan - # erase flash - U-Boot # nand erase.chip - U-Boot # env default -f -a - U-Boot # saveenv - # flash MLO. Redundant copies of MLO are kept for failsafe - U-Boot # load mmc 0 0x82000000 MLO - U-Boot # nand write 0x82000000 0x00000 0x20000 - U-Boot # nand write 0x82000000 0x20000 0x20000 - U-Boot # nand write 0x82000000 0x40000 0x20000 - U-Boot # nand write 0x82000000 0x60000 0x20000 - # flash u-boot.img - U-Boot # load mmc 0 0x82000000 u-boot.img - U-Boot # nand write 0x82000000 0x80000 0x60000 - # flash kernel image - U-Boot # load mmc 0 0x82000000 uImage - U-Boot # nand write 0x82000000 ${nandsrcaddr} ${nandimgsize} - # flash filesystem image - U-Boot # load mmc 0 0x82000000 filesystem.img - U-Boot # nand write 0x82000000 ${loadaddress} 0x300000 - -Step-3: Set BOOTSEL pin to select NAND boot, and POR the device. +1. Building u-boot for NAND boot + +.. list-table:: CONFIGxx options for NAND device + :widths: 25 25 + :header-rows: 1 + + * - Config + - Description + * - CONFIG_SYS_NAND_PAGE_SIZE + - number of main bytes in NAND page + * - CONFIG_SYS_NAND_OOBSIZE + - number of OOB bytes in NAND page + * - CONFIG_SYS_NAND_BLOCK_SIZE + - number of bytes in NAND erase-block + * - CFG_SYS_NAND_ECCPOS + - ECC map for NAND page + * - CONFIG_NAND_OMAP_ECCSCHEME + - (refer doc/README.nand) + +2. Flashing NAND via MMC/SD + +.. prompt:: bash + :prompts: => + + # select BOOTSEL to MMC/SD boot and boot from MMC/SD card + mmc rescan + # erase flash + nand erase.chip + env default -f -a + saveenv + # flash MLO. Redundant copies of MLO are kept for failsafe + load mmc 0 0x82000000 MLO + nand write 0x82000000 0x00000 0x20000 + nand write 0x82000000 0x20000 0x20000 + nand write 0x82000000 0x40000 0x20000 + nand write 0x82000000 0x60000 0x20000 + # flash u-boot.img + load mmc 0 0x82000000 u-boot.img + nand write 0x82000000 0x80000 0x60000 + # flash kernel image + load mmc 0 0x82000000 uImage + nand write 0x82000000 ${nandsrcaddr} ${nandimgsize} + # flash filesystem image + load mmc 0 0x82000000 filesystem.img + nand write 0x82000000 ${loadaddress} 0x300000 + +3. Set BOOTSEL pin to select NAND boot, and POR the device. The device should boot from images flashed on NAND device. @@ -107,16 +293,34 @@ Falcon Mode: eMMC The recommended layout in this case is: -.. code-block:: text - - MMC BLOCKS |--------------------------------| LOCATION IN BYTES - 0x0000 - 0x007F : MBR or GPT table : 0x000000 - 0x020000 - 0x0080 - 0x00FF : ARGS or FDT file : 0x010000 - 0x020000 - 0x0100 - 0x01FF : SPL.backup1 (first copy used) : 0x020000 - 0x040000 - 0x0200 - 0x02FF : SPL.backup2 (second copy used) : 0x040000 - 0x060000 - 0x0300 - 0x06FF : U-Boot : 0x060000 - 0x0e0000 - 0x0700 - 0x08FF : U-Boot Env + Redundant : 0x0e0000 - 0x120000 - 0x0900 - 0x28FF : Kernel : 0x120000 - 0x520000 +.. list-table:: eMMC Recommended Layout + :widths: 25 25 50 + :header-rows: 1 + + * - MMC Blocks + - Description + - Location in bytes + * - 0x0000 - 0x007F + - MBR or GPT table + - 0x000000 - 0x020000 + * - 0x0080 - 0x00FF + - ARGS or FDT file + - 0x010000 - 0x020000 + * - 0x0100 - 0x01FF + - SPL.backup1 (first copy used) + - 0x020000 - 0x040000 + * - 0x0200 - 0x02FF + - SPL.backup2 (second copy used) + - 0x040000 - 0x060000 + * - 0x0300 - 0x06FF + - U-Boot + - 0x060000 - 0x0e0000 + * - 0x0700 - 0x08FF + - U-Boot Env + Redundant + - 0x0e0000 - 0x120000 + * - 0x0900 - 0x28FF + - Kernel + - 0x120000 - 0x520000 Note that when we run 'spl export' it will prepare to boot the kernel. This includes relocation of the uImage from where we loaded it to the entry @@ -130,27 +334,28 @@ had a FAT partition (such as on a Beaglebone Black) it is not enough to write garbage into the area, you must delete it from the partition table first. -.. code-block:: text - - # Ensure we are able to talk with this mmc device - U-Boot # mmc rescan - U-Boot # tftp 81000000 am335x/MLO - # Write to two of the backup locations ROM uses - U-Boot # mmc write 81000000 100 100 - U-Boot # mmc write 81000000 200 100 - # Write U-Boot to the location set in the config - U-Boot # tftp 81000000 am335x/u-boot.img - U-Boot # mmc write 81000000 300 400 - # Load kernel and device tree into memory, perform export - U-Boot # tftp 81000000 am335x/uImage - U-Boot # run findfdt - U-Boot # tftp ${fdtaddr} am335x/${fdtfile} - U-Boot # run mmcargs - U-Boot # spl export fdt 81000000 - ${fdtaddr} - # Write the updated device tree to MMC - U-Boot # mmc write ${fdtaddr} 80 80 - # Write the uImage to MMC - U-Boot # mmc write 81000000 900 2000 +.. prompt:: bash + :prompts: => + + # Ensure we are able to talk with this mmc device + mmc rescan + tftp 81000000 am335x/MLO + # Write to two of the backup locations ROM uses + mmc write 81000000 100 100 + mmc write 81000000 200 100 + # Write U-Boot to the location set in the config + tftp 81000000 am335x/u-boot.img + mmc write 81000000 300 400 + # Load kernel and device tree into memory, perform export + tftp 81000000 am335x/uImage + run findfdt + tftp ${fdtaddr} am335x/${fdtfile} + run mmcargs + spl export fdt 81000000 - ${fdtaddr} + # Write the updated device tree to MMC + mmc write ${fdtaddr} 80 80 + # Write the uImage to MMC + mmc write 81000000 900 2000 Falcon Mode: FAT SD cards ------------------------- @@ -161,28 +366,30 @@ the FAT filesystem (only the uImage MUST be for this to function afterwards) along with a Falcon Mode aware MLO and the FAT partition has already been created and marked bootable: -.. code-block:: text +.. prompt:: bash + :prompts: => - U-Boot # mmc rescan - # Load kernel and device tree into memory, perform export - U-Boot # load mmc 0:1 ${loadaddr} uImage - U-Boot # run findfdt - U-Boot # load mmc 0:1 ${fdtaddr} ${fdtfile} - U-Boot # run mmcargs - U-Boot # spl export fdt ${loadaddr} - ${fdtaddr} + mmc rescan + # Load kernel and device tree into memory, perform export + load mmc 0:1 ${loadaddr} uImage + run findfdt + load mmc 0:1 ${fdtaddr} ${fdtfile} + run mmcargs + spl export fdt ${loadaddr} - ${fdtaddr} This will print a number of lines and then end with something like: -.. code-block:: text +.. code-block:: bash - Using Device Tree in place at 80f80000, end 80f85928 - Using Device Tree in place at 80f80000, end 80f88928 + Using Device Tree in place at 80f80000, end 80f85928 + Using Device Tree in place at 80f80000, end 80f88928 So then you: -.. code-block:: text +.. prompt:: bash + :prompts: => - U-Boot # fatwrite mmc 0:1 0x80f80000 args 8928 + fatwrite mmc 0:1 0x80f80000 args 8928 Falcon Mode: NAND ----------------- @@ -193,14 +400,15 @@ already located on the NAND somewhere (such as filesystem or mtd partition) along with a Falcon Mode aware MLO written to the correct locations for booting and mtdparts have been configured correctly for the board: -.. code-block:: text +.. prompt:: bash + :prompts: => - U-Boot # nand read ${loadaddr} kernel - U-Boot # load nand rootfs ${fdtaddr} /boot/am335x-evm.dtb - U-Boot # run nandargs - U-Boot # spl export fdt ${loadaddr} - ${fdtaddr} - U-Boot # nand erase.part u-boot-spl-os - U-Boot # nand write ${fdtaddr} u-boot-spl-os + nand read ${loadaddr} kernel + load nand rootfs ${fdtaddr} /boot/am335x-evm.dtb + run nandargs + spl export fdt ${loadaddr} - ${fdtaddr} + nand erase.part u-boot-spl-os + nand write ${fdtaddr} u-boot-spl-os USB device ---------- @@ -217,27 +425,35 @@ The output of the 'dm tree' command shows which driver is bound to which device, so the user can easily configure their platform differently from the command line: +.. prompt:: bash + :prompts: => + + dm tree + .. code-block:: text - => dm tree - Class Index Probed Driver Name - ----------------------------------------------------------- - [...] - misc 0 [ + ] ti-musb-wrapper | |-- usb@47400000 - usb 0 [ + ] ti-musb-peripheral | | |-- usb@47401000 - ethernet 1 [ + ] usb_ether | | | `-- usb_ether - bootdev 3 [ ] eth_bootdev | | | `-- usb_ether.bootdev - usb 0 [ ] ti-musb-host | | `-- usb@47401800 + Class Index Probed Driver Name + ----------------------------------------------------------- + [...] + misc 0 [ + ] ti-musb-wrapper | |-- usb@47400000 + usb 0 [ + ] ti-musb-peripheral | | |-- usb@47401000 + ethernet 1 [ + ] usb_ether | | | `-- usb_ether + bootdev 3 [ ] eth_bootdev | | | `-- usb_ether.bootdev + usb 0 [ ] ti-musb-host | | `-- usb@47401800 Typically here any network command performed using the usb_ether interface would work, while using other gadgets would fail: +.. prompt:: bash + :prompts: => + + fastboot usb 0 + .. code-block:: text - => fastboot usb 0 - All UDC in use (1 available), use the unbind command - g_dnl_register: failed!, error: -19 - exit not allowed from main input shell. + All UDC in use (1 available), use the unbind command + g_dnl_register: failed!, error: -19 + exit not allowed from main input shell. As hinted by the primary error message, the only controller available (usb@47401000) is currently bound to the usb_ether driver, which makes @@ -246,20 +462,25 @@ least from a bootloader point of view). The solution here would be to use the unbind command specifying the class and index parameters (as shown above in the 'dm tree' output) to target the driver to unbind: -.. code-block:: text +.. prompt:: bash + :prompts: => - => unbind ethernet 1 + unbind ethernet 1 The output of the 'dm tree' command now shows the availability of the first USB device controller, the fastboot gadget will now be able to bind with it: +.. prompt:: bash + :prompts: => + + dm tree + .. code-block:: text - => dm tree - Class Index Probed Driver Name - ----------------------------------------------------------- - [...] - misc 0 [ + ] ti-musb-wrapper | |-- usb@47400000 - usb 0 [ ] ti-musb-peripheral | | |-- usb@47401000 - usb 0 [ ] ti-musb-host | | `-- usb@47401800 + Class Index Probed Driver Name + ----------------------------------------------------------- + [...] + misc 0 [ + ] ti-musb-wrapper | |-- usb@47400000 + usb 0 [ ] ti-musb-peripheral | | |-- usb@47401000 + usb 0 [ ] ti-musb-host | | `-- usb@47401800 diff --git a/doc/board/ti/am43xx_evm.rst b/doc/board/ti/am43xx_evm.rst new file mode 100644 index 0000000..543526c --- /dev/null +++ b/doc/board/ti/am43xx_evm.rst @@ -0,0 +1,188 @@ +.. SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +.. sectionauthor:: Neha Malcom Francis <n-francis@ti.com> + +AM43xx Generation +================= + +Secure Boot +----------- + +.. include:: am335x_evm.rst + :start-after: .. secure_boot_include_start_config_ti_secure_device + :end-before: .. secure_boot_include_end_config_ti_secure_device + +.. include:: am335x_evm.rst + :start-after: .. secure_boot_include_start_spl_boot + :end-before: .. secure_boot_include_end_spl_boot + +<IMAGE_FLAG> is a value that specifies the type of the image to +generate OR the action the image generation tool will take. Valid +values are: + +.. list-table:: + :widths: 25 25 + :header-rows: 0 + + * - SPI_X-LOADER + - Generates an image for SPI flash (byte swapped) + * - XIP_X-LOADER + - Generates a single stage u-boot for NOR/QSPI XiP + * - ISSW + - Generates an image for all other boot modes + +<INPUT_FILE> is the full path and filename of the public world boot +loaderbinary file (depending on the boot media, this is usually +either u-boot-spl.bin or u-boot.bin). + +<OUTPUT_FILE> is the full path and filename of the final secure +image. The output binary images should be used in place of the standard +non-secure binary images (see the platform-specific user's guides and +releases notes for how the non-secure images are typically used) + +.. list-table:: + :widths: 25 25 + :header-rows: 0 + + * - u-boot-spl_HS_SPI_X-LOADER + - byte swapped boot image for SPI flash + * - u-boot_HS_XIP_X-LOADER + - boot image for NOR or QSPI Xip flash + * - u-boot-spl_HS_ISSW + - boot image for all other boot media + + +<SPL_LOAD_ADDR> is the address at which SOC ROM should load the +<INPUT_FILE> + +.. include:: am335x_evm.rst + :start-after: .. secure_boot_include_start_primary_u_boot + :end-before: .. secure_boot_include_end_primary_u_boot + +.. qspi_boot_support_include_start + +QSPI U-Boot support +------------------- + +Host processor is connected to serial flash device via qpsi +interface. QSPI is a kind of spi module that allows single, +dual and quad read access to external spi devices. The module +has a memory mapped interface which provide direct interface +for accessing data form external spi devices. + +The one QSPI in the device is primarily intended for fast booting +from Quad SPI flash devices. + +Usecase +^^^^^^^ + +MLO/u-boot.img will be flashed from SD/MMC to the flash device +using serial flash erase and write commands. Then, switch settings +will be changed to qspi boot. Then, the ROM code will read MLO +from the predefined location in the flash, where it was flashed and +execute it after storing it in SDRAM. Then, the MLO will read +u-boot.img from flash and execute it from SDRAM. + +SPI mode +^^^^^^^^ + +SPI mode uses mtd spi framework for transfer and reception of data. +Can be used in: + + #. Normal mode: use single pin for transfers + #. Dual Mode: use two pins for transfers. + #. Quad mode: use four pin for transfer + +Memory mapped read mode +^^^^^^^^^^^^^^^^^^^^^^^ + +In this, SPI controller is configured using configuration port and then +controller is switched to memory mapped port for data read. + +Driver +^^^^^^ + +drivers/qspi/ti_qspi.c + - File which is responsible for configuring the + qspi controller and also for providing the low level api which + is responsible for transferring the datas from host controller + to flash device and vice versa. + +.. qspi_boot_support_include_end + +Testing +^^^^^^^ + +These are the testing details of qspi flash driver with Macronix M25L51235 +flash device. + +The test includes + - probing the flash device + - erasing the flash device + - Writing to flash + - Reading the contents of the flash. + +Test Log + +.. code-block:: bash + + Hit any key to stop autoboot: 0 + => sf probe 0 + SF: Detected MX25L51235F with page size 256 Bytes, erase size 64 KiB, total 64 MiB, mapped at 30000000 + => sf erase 0 0x80000 + SF: 524288 bytes @ 0x0 Erased: OK + => mw 81000000 0xdededede 0x40000 + => sf write 81000000 0 0x40000 + SF: 262144 bytes @ 0x0 Written: OK + => sf read 82000000 0 0x40000 + SF: 262144 bytes @ 0x0 Read: OK + => md 0x82000000 + 82000000: dededede dededede dededede dededede ................ + 82000010: dededede dededede dededede dededede ................ + 82000020: dededede dededede dededede dededede ................ + 82000030: dededede dededede dededede dededede ................ + 82000040: dededede dededede dededede dededede ................ + 82000050: dededede dededede dededede dededede ................ + 82000060: dededede dededede dededede dededede ................ + 82000070: dededede dededede dededede dededede ................ + 82000080: dededede dededede dededede dededede ................ + 82000090: dededede dededede dededede dededede ................ + 820000a0: dededede dededede dededede dededede ................ + 820000b0: dededede dededede dededede dededede ................ + 820000c0: dededede dededede dededede dededede ................ + 820000d0: dededede dededede dededede dededede ................ + 820000e0: dededede dededede dededede dededede ................ + 820000f0: dededede dededede dededede dededede ................ + => md 0x82010000 + 82010000: dededede dededede dededede dededede ................ + 82010010: dededede dededede dededede dededede ................ + 82010020: dededede dededede dededede dededede ................ + 82010030: dededede dededede dededede dededede ................ + 82010040: dededede dededede dededede dededede ................ + 82010050: dededede dededede dededede dededede ................ + 82010060: dededede dededede dededede dededede ................ + 82010070: dededede dededede dededede dededede ................ + 82010080: dededede dededede dededede dededede ................ + 82010090: dededede dededede dededede dededede ................ + 820100a0: dededede dededede dededede dededede ................ + 820100b0: dededede dededede dededede dededede ................ + 820100c0: dededede dededede dededede dededede ................ + 820100d0: dededede dededede dededede dededede ................ + 820100e0: dededede dededede dededede dededede ................ + 820100f0: dededede dededede dededede dededede ................ + => md 0x82030000 + 82030000: dededede dededede dededede dededede ................ + 82030010: dededede dededede dededede dededede ................ + 82030020: dededede dededede dededede dededede ................ + 82030030: dededede dededede dededede dededede ................ + 82030040: dededede dededede dededede dededede ................ + 82030050: dededede dededede dededede dededede ................ + 82030060: dededede dededede dededede dededede ................ + 82030070: dededede dededede dededede dededede ................ + 82030080: dededede dededede dededede dededede ................ + 82030090: dededede dededede dededede dededede ................ + 820300a0: dededede dededede dededede dededede ................ + 820300b0: dededede dededede dededede dededede ................ + 820300c0: dededede dededede dededede dededede ................ + 820300d0: dededede dededede dededede dededede ................ + 820300e0: dededede dededede dededede dededede ................ + 820300f0: dededede dededede dededede dededede ................ diff --git a/doc/board/ti/dra7xx_evm.rst b/doc/board/ti/dra7xx_evm.rst new file mode 100644 index 0000000..4503b5e --- /dev/null +++ b/doc/board/ti/dra7xx_evm.rst @@ -0,0 +1,139 @@ +.. SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +.. sectionauthor:: Neha Malcom Francis <n-francis@ti.com> + +DRA7xx Generation +================= + +Secure Boot +----------- + +.. include:: am335x_evm.rst + :start-after: .. secure_boot_include_start_config_ti_secure_device + :end-before: .. secure_boot_include_end_config_ti_secure_device + +.. include:: am335x_evm.rst + :start-after: .. secure_boot_include_start_spl_boot + :end-before: .. secure_boot_include_end_spl_boot + +<IMAGE_FLAG> is a value that specifies the type of the image to +generate OR the action the image generation tool will take. Valid +values are: + +.. list-table:: + :widths: 25 25 + :header-rows: 0 + + * - X-LOADER + - Generates an image for NOR or QSPI boot modes + * - MLO + - Generates an image for NOR or QSPI boot modes + * - ULO + - Generates an image for USB/UART peripheral boot modes + +<INPUT_FILE> is the full path and filename of the public world boot +loaderbinary file (for this platform, this is always u-boot-spl.bin). + +<OUTPUT_FILE> is the full path and filename of the final secure image. +The output binary images should be used in place of the standard +non-secure binary images (see the platform-specific user's guides +and releases notes for how the non-secure images are typically used) + +.. list-table:: + :widths: 25 25 + :header-rows: 0 + + * - u-boot-spl_HS_SPI_X-LOADER + - boot image for SD/MMC/eMMC. This image is + copied to a file named MLO, which is the name that + the device ROM bootloader requires for loading from + the FAT partition of an SD card (same as on + non-secure devices) + * - u-boot-spl_HS_ULO + - boot image for USB/UART peripheral boot modes + * - u-boot-spl_HS_X-LOADER + - boot image for all other flash memories + including QSPI and NOR flash + +<SPL_LOAD_ADDR> is the address at which SOC ROM should load the +<INPUT_FILE> + +.. include:: am335x_evm.rst + :start-after: .. secure_boot_include_start_primary_u_boot + :end-before: .. secure_boot_include_end_primary_u_boot + +eMMC Boot Partition Use +----------------------- + +It is possible, depending on SYSBOOT configuration to boot from the eMMC +boot partitions using (name depending on documentation referenced) +Alternative Boot operation mode or Boot Sequence Option 1/2. In this +example we load MLO and u-boot.img from the build into DDR and then use +'mmc bootbus' to set the required rate (see TRM) and 'mmc partconfig' to +set boot0 as the boot device. + +.. prompt:: bash + :prompts: => + + setenv autoload no + usb start + dhcp + mmc dev 1 1 + tftp ${loadaddr} dra7xx/MLO + mmc write ${loadaddr} 0 100 + tftp ${loadaddr} dra7xx/u-boot.img + mmc write ${loadaddr} 300 400 + mmc bootbus 1 2 0 2 + mmc partconf 1 1 1 0 + mmc rst-function 1 1 + +.. include:: am43xx_evm.rst + :start-after: qspi_boot_support_include_start + :end-before: qspi_boot_support_include_end + +Testing +^^^^^^^ + +Build the patched U-Boot and load MLO/u-boot.img. + +Boot from another medium like MMC + +.. prompt:: bash + + => mmc dev 0 + mmc0 is current device + => fatload mmc 0 0x82000000 MLO + reading MLO + 55872 bytes read in 8 ms (6.7 MiB/s) + => fatload mmc 0 0x83000000 u-boot.img + reading u-boot.img + 248600 bytes read in 19 ms (12.5 MiB/s) + +Commands to erase/write u-boot/MLO to flash device + +.. prompt:: bash + + => sf probe 0 + SF: Detected S25FL256S_64K with page size 256 Bytes, erase size 64 KiB, total 32 MiB, mapped at 5c000000 + => sf erase 0 0x10000 + SF: 65536 bytes @ 0x0 Erased: OK + => sf erase 0x20000 0x10000 + SF: 65536 bytes @ 0x20000 Erased: OK + => sf erase 0x30000 0x10000 + SF: 65536 bytes @ 0x30000 Erased: OK + => sf erase 0x40000 0x10000 + SF: 65536 bytes @ 0x40000 Erased: OK + => sf erase 0x50000 0x10000 + SF: 65536 bytes @ 0x50000 Erased: OK + => sf erase 0x60000 0x10000 + SF: 65536 bytes @ 0x60000 Erased: OK + => sf write 82000000 0 0x10000 + SF: 65536 bytes @ 0x0 Written: OK + => sf write 83000000 0x20000 0x60000 + SF: 393216 bytes @ 0x20000 Written: OK + +Next, set sysboot to QSPI-1 boot mode(SYSBOOT[5:0] = 100110) and power +on. ROM should find the GP header at offset 0 and load/execute SPL. SPL +then detects that ROM was in QSPI-1 mode (boot code 10) and attempts to +find a U-Boot image header at offset 0x20000 (set in the config file) +and proceeds to load that image using the U-Boot image payload offset/size +from the header. It will then start U-Boot. diff --git a/doc/board/ti/index.rst b/doc/board/ti/index.rst index 89d537d..b9cdf23 100644 --- a/doc/board/ti/index.rst +++ b/doc/board/ti/index.rst @@ -7,4 +7,7 @@ Texas Instruments :maxdepth: 2 am335x_evm + am43xx_evm + dra7xx_evm + ks2_evm k3 diff --git a/doc/board/ti/ks2_evm.rst b/doc/board/ti/ks2_evm.rst new file mode 100644 index 0000000..0a78903 --- /dev/null +++ b/doc/board/ti/ks2_evm.rst @@ -0,0 +1,306 @@ +.. SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +.. sectionauthor:: Neha Malcom Francis <n-francis@ti.com> + +Keystone II EVM Generation +========================== + +Summary +------- + +This README has information on the U-Boot port for K2HK, K2E, and K2L EVM boards. +Documentation for this board can be found at: + + - http://www.advantech.com/Support/TI-EVM/EVMK2HX_sd.aspx + - https://www.einfochips.com/index.php/partnerships/texas-instruments/k2e-evm.html + - https://www.einfochips.com/index.php/partnerships/texas-instruments/k2l-evm.html + +The K2HK board is based on Texas Instruments Keystone2 family of SoCs: K2H, K2K. +More details on these SoCs are available at company websites: + +K2K: http://www.ti.com/product/tci6638k2k +K2H: http://www.ti.com/product/tci6638k2h + +The K2E SoC details are available at + http://www.ti.com/lit/ds/symlink/66ak2e05.pdf + +The K2L SoC details are available at + http://www.ti.com/lit/ds/symlink/tci6630k2l.pdf + +The K2G SoC details are available at + http://www.ti.com/lit/ds/symlink/66ak2g02.pdf + +Board Configuration +------------------- + +Some of the peripherals that are configured by U-Boot + +.. list-table:: + :widths: 10 10 10 10 10 10 10 10 + :header-rows: 1 + + * - + - DDR3 + - NAND + - MSM SRAM + - ETH Ports + - UART + - I2C + - SPI + * - K2HK + - 2 + - 512MB + - 6MB + - 4(2) + - 2 + - 3 + - 3 + * - K2E + - 4 + - 512MB + - 2MB + - 8(2) + - 2 + - 3 + - 3 + * - K2L + - 2 + - 512MB + - 2MB + - 4(2) + - 4 + - 3 + - 3 + * - K2G + - 2 + - 256MB + - 1MB + - 1 + - 1 + - 1 + - 1 + +There are only 2 eth port installed on the boards. + +There are separate PLLs to drive clocks to Tetris ARM and Peripherals. +To bring up SMP Linux on this board, there is a boot monitor +code that will be installed in MSMC SRAM. There is command available +to install this image from U-Boot. + +The port related files can be found at following folders: + - keystone2 SoC related files: arch/arm/cpu/armv7/keystone/ + - EVMs board files: board/ti/k2s_evm/ + +Board configuration files: + - include/configs/k2hk_evm.h + - include/configs/k2e_evm.h + - include/configs/k2l_evm.h + - include/configs/k2g_evm.h + +As U-Boot is migrating to Kconfig there is also board defconfig files + - configs/k2e_evm_defconfig + - configs/k2hk_evm_defconfig + - configs/k2l_evm_defconfig + - configs/k2g_evm_defconfig + +Supported boot modes: + - SPI NOR boot + - AEMIF NAND boot (K2E, K2L and K2HK) + - UART boot + - MMC boot (Only on K2G) + +Supported image formats: + - u-boot.bin: for loading and running u-boot.bin through Texas Instruments Code + Composer Studio (CCS) and for UART boot. + - u-boot-spi.gph: gpimage for programming SPI NOR flash for SPI NOR boot + - MLO: gpimage for programming NAND flash for NAND boot, MMC boot. + +Build Instructions +------------------ + +Examples for k2hk, for k2e, k2l and k2g just replace k2hk prefix accordingly. +Don't forget to add CROSS_COMPILE. + +To build u-boot.bin, u-boot-spi.gph, MLO: + +.. prompt:: bash + :prompts: $ + + make k2hk_evm_defconfig + make + +Load and Run U-Boot on Keystone EVMs using CCS +---------------------------------------------- + +Need Code Composer Studio (CCS) installed on a PC to load and run u-boot.bin +on EVM? See instructions at below link for installing CCS on a Windows PC. + + `<http://processors.wiki.ti.com/index.php/MCSDK_UG_Chapter_Getting_Started#Installing_Code_Composer_Studio>`_ + +Use u-boot.bin from the build folder for loading and running U-Boot binary +on EVM. Follow instructions at: + + - K2HK http://processors.wiki.ti.com/index.php/EVMK2H_Hardware_Setup + - K2E http://processors.wiki.ti.com/index.php/EVMK2E_Hardware_Setup + - K2L http://processors.wiki.ti.com/index.php/TCIEVMK2L_Hardware_Setup + - K2G http://processors.wiki.ti.com/index.php/66AK2G02_GP_EVM_Hardware_Setup + +to configure SW1 dip switch to use "No Boot/JTAG DSP Little Endian Boot Mode" +and Power ON the EVM. Follow instructions to connect serial port of EVM to +PC and start TeraTerm or Hyper Terminal. + +Start CCS on a Windows machine and Launch Target configuration as instructed at + + `<http://processors.wiki.ti.com/index.php/MCSDK_UG_Chapter_Exploring#Loading_and_Running_U-Boot_on_EVM_through_CCS>`_ + +The instructions provided in the above link uses a script for +loading the U-Boot binary on the target EVM. Instead do the following:- + +#. Right click to "Texas Instruments XDS2xx USB Emulator_0/CortexA15_1 core (D + is connected: Unknown)" at the debug window (This is created once Target + configuration is launched) and select "Connect Target". +#. Once target connect is successful, choose Tools->Load Memory option from the + top level menu. At the Load Memory window, choose the file u-boot.bin + through "Browse" button and click "next >" button. In the next window, enter + Start address as 0xc000000, choose Type-size "32 bits" and click "Finish" + button. +#. Click View -> Registers from the top level menu to view registers window. +#. From Registers, window expand "Core Registers" to view PC. Edit PC value + to be 0xc000000. From the "Run" top level menu, select "Free Run" +#. The U-Boot prompt is shown at the Tera Term/ Hyper terminal console as + below and type any key to stop autoboot as instructed. + +.. code-block:: bash + + U-Boot 2014.04-rc1-00201-gc215b5a (Mar 21 2014 - 12:47:59) + + I2C: ready + Detected SO-DIMM [SQR-SD3T-2G1333SED] + DRAM: 1.1 GiB + NAND: 512 MiB + Net: K2HK_EMAC + Warning: K2HK_EMAC using MAC address from net device + , K2HK_EMAC1, K2HK_EMAC2, K2HK_EMAC3 + Hit any key to stop autoboot: 0 + +SPI NOR Flash Programming Instructions +-------------------------------------- + +U-Boot image can be flashed to first 512KB of the NOR flash using following +instructions: + +1. Start CCS and run U-Boot as described above. +2. Suspend Target. Select Run -> Suspend from top level menu + CortexA15_1 (Free Running)" +3. Load u-boot-spi.gph binary from build folder on to DDR address 0x87000000 + through CCS as described in step 2 of "Load and Run U-Boot on K2HK/K2E/K2L + EVM using CCS", but using address 0x87000000. +4. Free Run the target as described earlier (step 4) to get U-Boot prompt +5. At the U-Boot console type following to setup U-Boot environment variables. + +.. prompt:: bash + :prompts: => + + setenv addr_uboot 0x87000000 + setenv filesize <size in hex of u-boot-spi.gph rounded to hex 0x10000> + run burn_uboot_spi + +Once U-Boot prompt is available, power off the EVM. Set the SW1 dip switch to +"SPI Little Endian Boot mode" as per instruction at + + `<http://processors.wiki.ti.com/index.php/*_Hardware_Setup>`_ + +6. Power ON the EVM. The EVM now boots with U-Boot image on the NOR flash. + +AEMIF NAND Flash programming instructions +----------------------------------------- + +U-Boot image can be flashed to first 1024KB of the NAND flash using following +instructions: + +1. Start CCS and run U-Boot as described above. +2. Suspend Target. Select Run -> Suspend from top level menu + CortexA15_1 (Free Running)" +3. Load MLO binary from build folder on to DDR address 0x87000000 + through CCS as described in step 2 of "Load and Run U-Boot on K2HK EVM + using CCS", but using address 0x87000000. +4. Free Run the target as described earlier (step 4) to get U-Boot prompt +5. At the U-Boot console type following to setup U-Boot environment variables. + +.. prompt:: bash + :prompts: => + + setenv filesize <size in hex of MLO rounded to hex 0x10000> + run burn_uboot_nand + +Once U-Boot prompt is available, Power OFF the EVM. Set the SW1 dip switch to +"ARM NAND Boot mode" as per instruction at + + `<http://processors.wiki.ti.com/index.php/>`_ + +under Hardware Setup + +6. Power ON the EVM. The EVM now boots with U-Boot image on the NAND flash. + +Load and Run U-Boot on keystone EVMs using UART download +-------------------------------------------------------- + +Open BMC and regular UART terminals. + +1. On the regular UART port start xmodem transfer of the u-boot.bin +2. Using BMC terminal set the ARM-UART bootmode and reboot the EVM + +.. prompt:: bash + + BMC> bootmode #4 + MBC> reboot + +3. When xmodem is complete you should see the U-Boot starts on the UART port + +Load and Run U-Boot on K2G EVMs using MMC +----------------------------------------- + +Open BMC and regular UART terminals. + +1. Set the SW3 dip switch to "ARM MMC Boot mode" as per instruction at + + `<http://processors.wiki.ti.com/index.php/66AK2G02_GP_EVM_Hardware_Setup>`_ + +2. Create SD card partitions as per steps given in Hardware Setup Guide. +3. Copy MLO to Boot Partition. +4. Insert SD card and Power on the EVM. + The EVM now boots with U-Boot image from SD card. + +Secure Boot +----------- + +.. include:: am335x_evm.rst + :start-after: .. secure_boot_include_start_config_ti_secure_device + :end-before: .. secure_boot_include_end_config_ti_secure_device + +.. include:: am335x_evm.rst + :start-after: .. secure_boot_include_start_spl_boot + :end-before: .. secure_boot_include_end_spl_boot + +<IMAGE_FLAG> is currently ignored and reserved for future use. + +<INPUT_FILE> is the full path and filename of the public world boot +loader binary file (only u-boot.bin is currently supported on +Keystone2 devices, u-boot-spl.bin is not currently supported). + +<OUTPUT_FILE> is the full path and filename of the final secure image. +The output binary images should be used in place of the standard +non-secure binary images (see the platform-specific user's guides +and releases notes for how the non-secure images are typically used) + +.. list-table:: + :widths: 10 20 + :header-rows: 0 + + * - u-boot_HS_MLO + - signed and encrypted boot image that can be used to + boot from all media. Secure boot from SPI NOR flash is not + currently supported. + +.. include:: am335x_evm.rst + :start-after: .. secure_boot_include_start_primary_u_boot + :end-before: .. secure_boot_include_end_primary_u_boot diff --git a/doc/develop/release_cycle.rst b/doc/develop/release_cycle.rst index 346cf29..7234338 100644 --- a/doc/develop/release_cycle.rst +++ b/doc/develop/release_cycle.rst @@ -48,13 +48,14 @@ Examples:: Current Status -------------- -* U-Boot v2023.07 was released on Mon 10 July 2023. +* U-Boot v2023.10 was released on Mon 02 October 2023. -* The Merge Window for the next release (v2023.10) is **closed**. +* The Merge Window for the next release (v2024.01) is **open** until the -rc1 + release on Mon 23 October 2023. -* The next branch is now **open**. +* The next branch is now **closed**. -* Release "v2023.10" is scheduled for 02 October 2023. +* Release "v2024.01" is scheduled for 08 January 2024. Future Releases --------------- @@ -62,29 +63,31 @@ Future Releases .. The following commented out dates are for when release candidates are planned to be tagged. -For the next scheduled release, release candidates were made on:: +.. For the next scheduled release, release candidates were made on:: -* U-Boot v2023.10-rc1 was released on Tue 25 July 2023. +.. * U-Boot v2024.01-rc1 was released on Mon 23 October 2023. -* U-Boot v2023.10-rc2 was released on Mon 07 August 2023. +.. * U-Boot v2024.01-rc2 was released on Mon 06 November 2023. -* U-Boot v2023.10-rc3 was released on Mon 21 August 2023. +.. * U-Boot v2024.01-rc3 was released on Mon 20 November 2023. -* U-Boot v2023.10-rc4 was released on Mon 04 September 2023. +.. * U-Boot v2024.01-rc4 was released on Mon 04 December 2023. -.. * U-Boot v2023.10-rc5 was released on Mon 18 September 2023. +.. * U-Boot v2024.01-rc5 was released on Mon 18 December 2023. + +.. * U-Boot v2024.01-rc6 was released on Tue 02 January 2024. Please note that the following dates are planned only and may be deviated from as needed. -* "v2023.10": end of MW = Mon, Jul 24, 2023; release = Mon, Oct 02, 2023 - * "v2024.01": end of MW = Mon, Oct 23, 2023; release = Mon, Jan 08, 2024 * "v2024.04": end of MW = Mon, Jan 29, 2024; release = Tue, Apr 02, 2024 * "v2024.07": end of MW = Mon, Apr 22, 2024; release = Mon, Jul 01, 2024 +* "v2024.10": end of MW = Mon, Jul 22, 2024; release = Mon, Oct 07, 2024 + Previous Releases ----------------- @@ -92,6 +95,8 @@ Note: these statistics are generated by our fork of `gitdm <https://source.denx.de/u-boot/gitdm>`_, which was originally created by Jonathan Corbet. +* :doc:`statistics/u-boot-stats-v2023.10` which was released on 02 October 2023. + * :doc:`statistics/u-boot-stats-v2023.07` which was released on 10 July 2023. * :doc:`statistics/u-boot-stats-v2023.04` which was released on 03 April 2023. diff --git a/doc/develop/statistics/u-boot-stats-v2023.10.rst b/doc/develop/statistics/u-boot-stats-v2023.10.rst new file mode 100644 index 0000000..334f2bb --- /dev/null +++ b/doc/develop/statistics/u-boot-stats-v2023.10.rst @@ -0,0 +1,898 @@ +:orphan: + +Release Statistics for U-Boot v2023.10 +====================================== + +* Processed 1530 changesets from 208 developers + +* 31 employers found + +* A total of 128954 lines added, 38436 removed (delta 90518) + +.. table:: Developers with the most changesets + :widths: auto + + ==================================== ===== + Name Count + ==================================== ===== + Simon Glass 273 (17.8%) + Heinrich Schuchardt 71 (4.6%) + Marek Vasut 62 (4.1%) + Tom Rini 57 (3.7%) + Jonas Karlman 54 (3.5%) + Nishanth Menon 35 (2.3%) + Bin Meng 32 (2.1%) + Michal Simek 31 (2.0%) + Camelia Groza 30 (2.0%) + Weijie Gao 29 (1.9%) + Patrick Delaunay 25 (1.6%) + Lukasz Majewski 23 (1.5%) + Neha Malcom Francis 22 (1.4%) + Abdellatif El Khlifi 21 (1.4%) + Fabio Estevam 19 (1.2%) + Jim Liu 18 (1.2%) + Tim Harvey 17 (1.1%) + Peng Fan 17 (1.1%) + Mathew McBride 17 (1.1%) + Manorit Chawdhry 16 (1.0%) + Masahisa Kojima 16 (1.0%) + Andre Przywara 15 (1.0%) + Ioana Ciornei 14 (0.9%) + Ilias Apalodimas 13 (0.8%) + Jagan Teki 13 (0.8%) + Nikhil M Jain 13 (0.8%) + Lukas Funke 13 (0.8%) + Ashok Reddy Soma 13 (0.8%) + Eugen Hristev 12 (0.8%) + Shengyu Qu 12 (0.8%) + Algapally Santosh Sagar 12 (0.8%) + Adam Ford 11 (0.7%) + Ondrej Jirman 11 (0.7%) + Stefan Herbrechtsmeier 11 (0.7%) + Yanhong Wang 11 (0.7%) + Jassi Brar 11 (0.7%) + Andrew Davis 10 (0.7%) + Joshua Watt 10 (0.7%) + Alper Nebi Yasak 10 (0.7%) + Troy Kisky 10 (0.7%) + Minda Chen 9 (0.6%) + Chris Packham 9 (0.6%) + Oleksandr Suvorov 8 (0.5%) + Marcel Ziswiler 8 (0.5%) + Venkatesh Yadav Abbarapu 8 (0.5%) + Jens Wiklander 8 (0.5%) + Ye Li 8 (0.5%) + Massimo Pegorer 7 (0.5%) + Patrice Chotard 7 (0.5%) + Emanuele Ghidoli 7 (0.5%) + Chris Morgan 7 (0.5%) + Valentine Barshak 7 (0.5%) + Jan Kiszka 6 (0.4%) + Paul Barker 6 (0.4%) + Hai Pham 6 (0.4%) + Andrejs Cainikovs 6 (0.4%) + Angelo Dureghello 6 (0.4%) + William Zhang 6 (0.4%) + Tobias Deiminger 6 (0.4%) + Svyatoslav Ryhel 6 (0.4%) + Rui Miguel Silva 6 (0.4%) + Bhavya Kapoor 6 (0.4%) + Chanho Park 5 (0.3%) + Peter Robinson 5 (0.3%) + Pegorer Massimo 5 (0.3%) + Vignesh Raghavendra 5 (0.3%) + Xingyu Wu 5 (0.3%) + Hugo Villeneuve 5 (0.3%) + Rasmus Villemoes 5 (0.3%) + Igor Prusov 5 (0.3%) + Ravi Gunasekaran 4 (0.3%) + Sam Edwards 4 (0.3%) + AKASHI Takahiro 4 (0.3%) + Mayuresh Chitale 4 (0.3%) + Alex Bee 4 (0.3%) + Tianling Shen 4 (0.3%) + Christian Taedcke 4 (0.3%) + Kamlesh Gurudasani 4 (0.3%) + Yixun Lan 4 (0.3%) + Ben Dooks 4 (0.3%) + Eduard Strehlau 3 (0.2%) + Maxim Cournoyer 3 (0.2%) + Dario Binacchi 3 (0.2%) + Quentin Schulz 3 (0.2%) + Sergei Antonov 3 (0.2%) + Max Krummenacher 3 (0.2%) + Dan Carpenter 3 (0.2%) + Mason Huo 3 (0.2%) + Christopher Obbard 3 (0.2%) + Harini Katakam 3 (0.2%) + Raymond Mao 3 (0.2%) + Christophe Leroy 3 (0.2%) + Ying Sun 3 (0.2%) + Conor Dooley 3 (0.2%) + Alexey Romanov 3 (0.2%) + Ferass El Hafidi 3 (0.2%) + Udit Kumar 3 (0.2%) + Bhupesh Sharma 2 (0.1%) + Francois Berder 2 (0.1%) + Alexander Dahl 2 (0.1%) + Kunihiko Hayashi 2 (0.1%) + Torsten Duwe 2 (0.1%) + Stefan Roese 2 (0.1%) + Yifan Zhao 2 (0.1%) + Bryan Brattlof 2 (0.1%) + Roger Quadros 2 (0.1%) + Sjoerd Simons 2 (0.1%) + Ehsan Mohandesi 2 (0.1%) + Philippe Reynes 2 (0.1%) + Radhey Shyam Pandey 2 (0.1%) + Mikhail Kalashnikov 2 (0.1%) + Andreas Dannenberg 2 (0.1%) + Luca Ellero 2 (0.1%) + Teresa Remmet 2 (0.1%) + Yannic Moog 2 (0.1%) + Bruce Suen 2 (0.1%) + Tony Dinh 2 (0.1%) + Yu Chien Peter Lin 2 (0.1%) + Thierry Reding 2 (0.1%) + Florin Chiculita 2 (0.1%) + Masami Hiramatsu 2 (0.1%) + Leo Yan 2 (0.1%) + Mickaël Tansorier 1 (0.1%) + Fei Shao 1 (0.1%) + Rong Tao 1 (0.1%) + Ryosuke Saito 1 (0.1%) + Richard Weinberger 1 (0.1%) + Jaewon Jung 1 (0.1%) + Joao Marcos Costa 1 (0.1%) + Bo Gan 1 (0.1%) + Seung-Woo Kim 1 (0.1%) + Elena Popa 1 (0.1%) + Ricardo Salveti 1 (0.1%) + Daniel Golle 1 (0.1%) + Frank Wunderlich 1 (0.1%) + Sumit Garg 1 (0.1%) + Thomas Mittelstaedt 1 (0.1%) + Jonathan Humphreys 1 (0.1%) + Siddharth Vadapalli 1 (0.1%) + Puhan Zhou 1 (0.1%) + Kever Yang 1 (0.1%) + Valentin Caron 1 (0.1%) + Dmitry Dunaev 1 (0.1%) + Meng Li 1 (0.1%) + Jason Wessel 1 (0.1%) + FUKAUMI Naoki 1 (0.1%) + Damon Ding 1 (0.1%) + Anton 1 (0.1%) + Alvaro Fernando García 1 (0.1%) + Andy Yan 1 (0.1%) + Mattijs Korpershoek 1 (0.1%) + Shenlin Liang 1 (0.1%) + Miquel Raynal 1 (0.1%) + Jit Loon Lim 1 (0.1%) + Jason Kacines 1 (0.1%) + Jaehoon Chung 1 (0.1%) + Sean Anderson 1 (0.1%) + Maxime Ripard 1 (0.1%) + Paul Kocialkowski 1 (0.1%) + Jon Lin 1 (0.1%) + Johan Jonker 1 (0.1%) + Joseph Chen 1 (0.1%) + Frank Wang 1 (0.1%) + Nate Drude 1 (0.1%) + Karsten Wiese 1 (0.1%) + Richard Habeeb 1 (0.1%) + Zixun LI 1 (0.1%) + Samuel Dionne-Riel 1 (0.1%) + Maksim Kiselev 1 (0.1%) + Piyush Mehta 1 (0.1%) + Parth Gajjar 1 (0.1%) + Manikanta Guntupalli 1 (0.1%) + Varalaxmi Bingi 1 (0.1%) + Raju Kumar Pothuraju 1 (0.1%) + Sharath Kumar Dasari 1 (0.1%) + John Clark 1 (0.1%) + John Keeping 1 (0.1%) + Alexey Brodkin 1 (0.1%) + Julien Delbergue 1 (0.1%) + Emmanuel Di Fede 1 (0.1%) + Matthias Schiffer 1 (0.1%) + Cem Tenruh 1 (0.1%) + Utkarsh Gupta 1 (0.1%) + Maximus Sun 1 (0.1%) + Gaurav Jain 1 (0.1%) + Nitin Garg 1 (0.1%) + Clement Faure 1 (0.1%) + Stefan Eichenberger 1 (0.1%) + Pali Rohár 1 (0.1%) + Sergio Prado 1 (0.1%) + Giulio Benetti 1 (0.1%) + Malte Schmidt 1 (0.1%) + Hoegeun Kwon 1 (0.1%) + Kshitiz Varshney 1 (0.1%) + Peter Korsgaard 1 (0.1%) + Jonas Schwöbel 1 (0.1%) + Tomasz Maciej Nowak 1 (0.1%) + Masahiro Yamada 1 (0.1%) + Julien Panis 1 (0.1%) + Stefano Babic 1 (0.1%) + Mario Kicherer 1 (0.1%) + Marcus Comstedt 1 (0.1%) + Geert Uytterhoeven 1 (0.1%) + Cong Dang 1 (0.1%) + Yegor Yefremov 1 (0.1%) + Baruch Siach 1 (0.1%) + Samuel Holland 1 (0.1%) + Martin Hundebøll 1 (0.1%) + ==================================== ===== + + +.. table:: Developers with the most changed lines + :widths: auto + + ==================================== ===== + Name Count + ==================================== ===== + Neha Malcom Francis 25668 (17.1%) + Tom Rini 15768 (10.5%) + Nishanth Menon 13251 (8.8%) + Simon Glass 12357 (8.2%) + Abdellatif El Khlifi 8383 (5.6%) + Marcel Ziswiler 7482 (5.0%) + Jonas Karlman 5997 (4.0%) + Weijie Gao 5559 (3.7%) + Svyatoslav Ryhel 5053 (3.4%) + Ioana Ciornei 4033 (2.7%) + Venkatesh Yadav Abbarapu 2938 (2.0%) + Patrick Delaunay 2366 (1.6%) + Tim Harvey 1825 (1.2%) + Tianling Shen 1806 (1.2%) + Yanhong Wang 1725 (1.2%) + Valentine Barshak 1545 (1.0%) + Masahisa Kojima 1497 (1.0%) + Heinrich Schuchardt 1462 (1.0%) + Jassi Brar 1358 (0.9%) + Igor Prusov 1306 (0.9%) + Marek Vasut 1236 (0.8%) + Jason Kacines 1190 (0.8%) + Eugen Hristev 1140 (0.8%) + Peng Fan 969 (0.6%) + Frank Wang 958 (0.6%) + Masami Hiramatsu 939 (0.6%) + Lukas Funke 906 (0.6%) + Andy Yan 854 (0.6%) + William Zhang 813 (0.5%) + Adam Ford 800 (0.5%) + Yixun Lan 790 (0.5%) + Cem Tenruh 744 (0.5%) + Ashok Reddy Soma 680 (0.5%) + Mason Huo 658 (0.4%) + Yifan Zhao 645 (0.4%) + Conor Dooley 536 (0.4%) + Manorit Chawdhry 523 (0.3%) + Joshua Watt 454 (0.3%) + Chris Packham 439 (0.3%) + Raymond Mao 432 (0.3%) + Chris Morgan 431 (0.3%) + Christian Taedcke 428 (0.3%) + Michal Simek 422 (0.3%) + Xingyu Wu 386 (0.3%) + Camelia Groza 380 (0.3%) + Ondrej Jirman 377 (0.3%) + Stefan Roese 362 (0.2%) + Ye Li 360 (0.2%) + Ferass El Hafidi 339 (0.2%) + Udit Kumar 338 (0.2%) + Angelo Dureghello 335 (0.2%) + Andrew Davis 308 (0.2%) + Andre Przywara 303 (0.2%) + Luca Ellero 300 (0.2%) + Emanuele Ghidoli 296 (0.2%) + Jan Kiszka 292 (0.2%) + Jagan Teki 290 (0.2%) + Jim Liu 283 (0.2%) + Patrice Chotard 264 (0.2%) + Hugo Villeneuve 256 (0.2%) + Mikhail Kalashnikov 254 (0.2%) + Bin Meng 244 (0.2%) + Alexey Romanov 244 (0.2%) + Ilias Apalodimas 232 (0.2%) + Jens Wiklander 232 (0.2%) + Mayuresh Chitale 214 (0.1%) + Joseph Chen 198 (0.1%) + Christopher Obbard 185 (0.1%) + Nikhil M Jain 175 (0.1%) + Lukasz Majewski 155 (0.1%) + Tobias Deiminger 145 (0.1%) + Florin Chiculita 144 (0.1%) + Yannic Moog 131 (0.1%) + Tony Dinh 128 (0.1%) + Massimo Pegorer 124 (0.1%) + Philippe Reynes 124 (0.1%) + Mathew McBride 123 (0.1%) + Algapally Santosh Sagar 121 (0.1%) + Stefan Herbrechtsmeier 120 (0.1%) + Alex Bee 118 (0.1%) + Peter Robinson 103 (0.1%) + Rui Miguel Silva 98 (0.1%) + Cong Dang 94 (0.1%) + Hai Pham 92 (0.1%) + Clement Faure 91 (0.1%) + Karsten Wiese 89 (0.1%) + Vignesh Raghavendra 85 (0.1%) + Thomas Mittelstaedt 84 (0.1%) + Fabio Estevam 82 (0.1%) + Shengyu Qu 77 (0.1%) + Roger Quadros 74 (0.0%) + Troy Kisky 71 (0.0%) + Kamlesh Gurudasani 67 (0.0%) + Alper Nebi Yasak 66 (0.0%) + Miquel Raynal 62 (0.0%) + Maxime Ripard 61 (0.0%) + Christophe Leroy 59 (0.0%) + Max Krummenacher 53 (0.0%) + Sergei Antonov 52 (0.0%) + Oleksandr Suvorov 50 (0.0%) + Manikanta Guntupalli 49 (0.0%) + Sam Edwards 48 (0.0%) + Ryosuke Saito 41 (0.0%) + Quentin Schulz 39 (0.0%) + Leo Yan 38 (0.0%) + Zixun LI 37 (0.0%) + Bruce Suen 36 (0.0%) + Torsten Duwe 35 (0.0%) + Minda Chen 34 (0.0%) + Ben Dooks 33 (0.0%) + Yu Chien Peter Lin 31 (0.0%) + Chanho Park 29 (0.0%) + Pegorer Massimo 29 (0.0%) + Yegor Yefremov 29 (0.0%) + Andrejs Cainikovs 28 (0.0%) + Ravi Gunasekaran 28 (0.0%) + Paul Barker 27 (0.0%) + Nitin Garg 27 (0.0%) + Bo Gan 24 (0.0%) + Gaurav Jain 24 (0.0%) + Bhavya Kapoor 21 (0.0%) + Johan Jonker 21 (0.0%) + Emmanuel Di Fede 19 (0.0%) + Julien Panis 17 (0.0%) + Jonas Schwöbel 16 (0.0%) + Masahiro Yamada 15 (0.0%) + Stefano Babic 15 (0.0%) + Eduard Strehlau 14 (0.0%) + Radhey Shyam Pandey 14 (0.0%) + Nate Drude 14 (0.0%) + Kever Yang 13 (0.0%) + Sean Anderson 13 (0.0%) + John Keeping 13 (0.0%) + Pali Rohár 13 (0.0%) + AKASHI Takahiro 12 (0.0%) + Harini Katakam 12 (0.0%) + Valentin Caron 12 (0.0%) + Sharath Kumar Dasari 11 (0.0%) + Rasmus Villemoes 9 (0.0%) + Bryan Brattlof 9 (0.0%) + Richard Weinberger 9 (0.0%) + Alexey Brodkin 9 (0.0%) + Dario Binacchi 8 (0.0%) + Alexander Dahl 8 (0.0%) + Ricardo Salveti 8 (0.0%) + Sumit Garg 8 (0.0%) + Jon Lin 8 (0.0%) + Andreas Dannenberg 7 (0.0%) + Elena Popa 7 (0.0%) + Maximus Sun 7 (0.0%) + Tomasz Maciej Nowak 7 (0.0%) + Maxim Cournoyer 6 (0.0%) + Dan Carpenter 6 (0.0%) + Kunihiko Hayashi 6 (0.0%) + Francois Berder 5 (0.0%) + Alvaro Fernando García 5 (0.0%) + Shenlin Liang 5 (0.0%) + Thierry Reding 4 (0.0%) + Jaewon Jung 4 (0.0%) + Anton 4 (0.0%) + Mattijs Korpershoek 4 (0.0%) + Parth Gajjar 4 (0.0%) + Varalaxmi Bingi 4 (0.0%) + John Clark 4 (0.0%) + Stefan Eichenberger 4 (0.0%) + Ying Sun 3 (0.0%) + Ehsan Mohandesi 3 (0.0%) + Jonathan Humphreys 3 (0.0%) + Siddharth Vadapalli 3 (0.0%) + Puhan Zhou 3 (0.0%) + Jason Wessel 3 (0.0%) + Jit Loon Lim 3 (0.0%) + Paul Kocialkowski 3 (0.0%) + Bhupesh Sharma 2 (0.0%) + Sjoerd Simons 2 (0.0%) + Teresa Remmet 2 (0.0%) + Fei Shao 2 (0.0%) + Joao Marcos Costa 2 (0.0%) + Daniel Golle 2 (0.0%) + Frank Wunderlich 2 (0.0%) + Meng Li 2 (0.0%) + Piyush Mehta 2 (0.0%) + Utkarsh Gupta 2 (0.0%) + Geert Uytterhoeven 2 (0.0%) + Mickaël Tansorier 1 (0.0%) + Rong Tao 1 (0.0%) + Seung-Woo Kim 1 (0.0%) + Dmitry Dunaev 1 (0.0%) + FUKAUMI Naoki 1 (0.0%) + Damon Ding 1 (0.0%) + Jaehoon Chung 1 (0.0%) + Richard Habeeb 1 (0.0%) + Samuel Dionne-Riel 1 (0.0%) + Maksim Kiselev 1 (0.0%) + Raju Kumar Pothuraju 1 (0.0%) + Julien Delbergue 1 (0.0%) + Matthias Schiffer 1 (0.0%) + Sergio Prado 1 (0.0%) + Giulio Benetti 1 (0.0%) + Malte Schmidt 1 (0.0%) + Hoegeun Kwon 1 (0.0%) + Kshitiz Varshney 1 (0.0%) + Peter Korsgaard 1 (0.0%) + Mario Kicherer 1 (0.0%) + Marcus Comstedt 1 (0.0%) + Baruch Siach 1 (0.0%) + Samuel Holland 1 (0.0%) + Martin Hundebøll 1 (0.0%) + ==================================== ===== + + +.. table:: Developers with the most lines removed + :widths: auto + + ==================================== ===== + Name Count + ==================================== ===== + Tom Rini 14691 (38.2%) + Ioana Ciornei 1157 (3.0%) + Jan Kiszka 111 (0.3%) + Jassi Brar 99 (0.3%) + Conor Dooley 96 (0.2%) + Jens Wiklander 92 (0.2%) + Andrew Davis 86 (0.2%) + Peter Robinson 82 (0.2%) + Stefan Herbrechtsmeier 75 (0.2%) + Vignesh Raghavendra 50 (0.1%) + Christophe Leroy 36 (0.1%) + Cong Dang 16 (0.0%) + Oleksandr Suvorov 15 (0.0%) + Masahiro Yamada 15 (0.0%) + Sean Anderson 12 (0.0%) + Pali Rohár 11 (0.0%) + Pegorer Massimo 10 (0.0%) + Alex Bee 8 (0.0%) + Alexey Brodkin 8 (0.0%) + John Keeping 7 (0.0%) + Dario Binacchi 7 (0.0%) + Yegor Yefremov 6 (0.0%) + Shenlin Liang 5 (0.0%) + Bryan Brattlof 3 (0.0%) + Cem Tenruh 2 (0.0%) + Stefan Eichenberger 2 (0.0%) + Piyush Mehta 2 (0.0%) + Richard Habeeb 1 (0.0%) + ==================================== ===== + + +.. table:: Developers with the most signoffs (total 305) + :widths: auto + + ==================================== ===== + Name Count + ==================================== ===== + Peng Fan 61 (20.0%) + Michal Simek 48 (15.7%) + Neil Armstrong 11 (3.6%) + Marek Vasut 11 (3.6%) + Manorit Chawdhry 9 (3.0%) + Ashok Reddy Soma 9 (3.0%) + Heinrich Schuchardt 8 (2.6%) + Andrew Davis 7 (2.3%) + Sam Shih 7 (2.3%) + Francesco Dolcini 7 (2.3%) + Thierry Reding 7 (2.3%) + Hai Pham 7 (2.3%) + Nishanth Menon 7 (2.3%) + Bo Gan 6 (2.0%) + Bin Meng 6 (2.0%) + Simon Glass 6 (2.0%) + Tam Nguyen 5 (1.6%) + Nicolas Frattaroli 5 (1.6%) + Hal Feng 5 (1.6%) + Patrick Delaunay 5 (1.6%) + Marcel Ziswiler 5 (1.6%) + Tom Rini 4 (1.3%) + Venkatesh Yadav Abbarapu 4 (1.3%) + Stefan Herbrechtsmeier 3 (1.0%) + Tom 3 (1.0%) + Minda Chen 3 (1.0%) + Andrejs Cainikovs 3 (1.0%) + Fabio Estevam 3 (1.0%) + Eugen Hristev 3 (1.0%) + Neha Malcom Francis 3 (1.0%) + Ioana Ciornei 2 (0.7%) + Jassi Brar 2 (0.7%) + SkyLake.Huang 2 (0.7%) + Andre Przywara 2 (0.7%) + Kever Yang 2 (0.7%) + Kamlesh Gurudasani 2 (0.7%) + Clement Faure 2 (0.7%) + Jonas Karlman 2 (0.7%) + Vignesh Raghavendra 1 (0.3%) + Cong Dang 1 (0.3%) + Oleksandr Suvorov 1 (0.3%) + Bryan Brattlof 1 (0.3%) + Xueliang Zhong 1 (0.3%) + Tarun Sahu 1 (0.3%) + Vishal Sagar 1 (0.3%) + faqiang.zhu 1 (0.3%) + Evgeny Bachinin 1 (0.3%) + Sughosh Ganu 1 (0.3%) + Meng Li 1 (0.3%) + Massimo Pegorer 1 (0.3%) + Nikhil M Jain 1 (0.3%) + Patrice Chotard 1 (0.3%) + Jagan Teki 1 (0.3%) + Ye Li 1 (0.3%) + Emanuele Ghidoli 1 (0.3%) + Svyatoslav Ryhel 1 (0.3%) + ==================================== ===== + + +.. table:: Developers with the most reviews (total 961) + :widths: auto + + ==================================== ===== + Name Count + ==================================== ===== + Simon Glass 220 (22.9%) + Kever Yang 109 (11.3%) + Bin Meng 105 (10.9%) + Leo Yu-Chi Liang 52 (5.4%) + Peng Fan 43 (4.5%) + Patrice Chotard 39 (4.1%) + Tom Rini 38 (4.0%) + Ilias Apalodimas 38 (4.0%) + Heinrich Schuchardt 31 (3.2%) + Marek Vasut 30 (3.1%) + Ramon Fried 28 (2.9%) + Andy Shevchenko 22 (2.3%) + Jagan Teki 19 (2.0%) + Stefan Roese 16 (1.7%) + Rick Chen 12 (1.2%) + Patrick Delaunay 11 (1.1%) + Jernej Skrabec 10 (1.0%) + Neil Armstrong 9 (0.9%) + Fabio Estevam 9 (0.9%) + Nikhil M Jain 8 (0.8%) + Devarsh Thakkar 7 (0.7%) + Nishanth Menon 6 (0.6%) + Neha Malcom Francis 6 (0.6%) + Bryan Brattlof 6 (0.6%) + Quentin Schulz 5 (0.5%) + Torsten Duwe 5 (0.5%) + Heiko Schocher 4 (0.4%) + Wei Fu 4 (0.4%) + Mattijs Korpershoek 4 (0.4%) + Eugen Hristev 3 (0.3%) + Ye Li 3 (0.3%) + Siddharth Vadapalli 3 (0.3%) + Jaehoon Chung 3 (0.3%) + Padmarao Begari 3 (0.3%) + Etienne Carriere 3 (0.3%) + Roger Quadros 3 (0.3%) + Mayuresh Chitale 3 (0.3%) + Andrew Davis 2 (0.2%) + Jens Wiklander 2 (0.2%) + Pali Rohár 2 (0.2%) + Xavier Drudis Ferran 2 (0.2%) + Michael Trimarchi 2 (0.2%) + Viacheslav Mitrofanov 2 (0.2%) + Takeshi Kihara 2 (0.2%) + Oliver Graute 2 (0.2%) + Radhey Shyam Pandey 2 (0.2%) + Andre Przywara 1 (0.1%) + Sean Anderson 1 (0.1%) + Yoann Congal 1 (0.1%) + Biju Das 1 (0.1%) + Gao Xiang 1 (0.1%) + elaine.zhang 1 (0.1%) + Stefan Agner 1 (0.1%) + Mark Kettenis 1 (0.1%) + Huang Jianan 1 (0.1%) + Haibo Chen 1 (0.1%) + Horia Geanta 1 (0.1%) + Frieder Schrempf 1 (0.1%) + Anup Patel 1 (0.1%) + Minkyu Kang 1 (0.1%) + Claudiu Manoil 1 (0.1%) + Qu Wenruo 1 (0.1%) + Andrew Lunn 1 (0.1%) + Paul Barker 1 (0.1%) + Gaurav Jain 1 (0.1%) + Maxime Ripard 1 (0.1%) + Miquel Raynal 1 (0.1%) + Adam Ford 1 (0.1%) + Weijie Gao 1 (0.1%) + ==================================== ===== + + +.. table:: Developers with the most test credits (total 87) + :widths: auto + + ==================================== ===== + Name Count + ==================================== ===== + Simon Glass 13 (14.9%) + Milan P. Stanić 8 (9.2%) + Sughosh Ganu 7 (8.0%) + Andreas Westman Dorcsak 7 (8.0%) + Svyatoslav Ryhel 6 (6.9%) + Bin Meng 4 (4.6%) + Tom Rini 4 (4.6%) + Roland Ruckerbauer 4 (4.6%) + Nikhil M Jain 3 (3.4%) + Maxime Ripard 3 (3.4%) + Miquel Raynal 3 (3.4%) + Heinrich Schuchardt 2 (2.3%) + Mattijs Korpershoek 2 (2.3%) + Padmarao Begari 2 (2.3%) + Oliver Graute 2 (2.3%) + Michal Simek 2 (2.3%) + Gowtham Suresh Kumar 2 (2.3%) + Mihai Sain 2 (2.3%) + Ravi Gunasekaran 2 (2.3%) + Sam Edwards 2 (2.3%) + Xavier Drudis Ferran 1 (1.1%) + Stefan Agner 1 (1.1%) + Marcel Ziswiler 1 (1.1%) + FUKAUMI Naoki 1 (1.1%) + Ion Agorria 1 (1.1%) + Masahisa Kojima 1 (1.1%) + Tim Harvey 1 (1.1%) + ==================================== ===== + + +.. table:: Developers who gave the most tested-by credits (total 87) + :widths: auto + + ==================================== ===== + Name Count + ==================================== ===== + Svyatoslav Ryhel 12 (13.8%) + Bin Meng 8 (9.2%) + Marek Vasut 7 (8.0%) + Jassi Brar 7 (8.0%) + Simon Glass 6 (6.9%) + Chanho Park 6 (6.9%) + Sjoerd Simons 6 (6.9%) + Shengyu Qu 4 (4.6%) + Peng Fan 2 (2.3%) + Stefan Roese 2 (2.3%) + Jonas Karlman 2 (2.3%) + Conor Dooley 2 (2.3%) + John Keeping 2 (2.3%) + Jonas Schwöbel 2 (2.3%) + Alper Nebi Yasak 2 (2.3%) + Abdellatif El Khlifi 2 (2.3%) + Tom Rini 1 (1.1%) + Heinrich Schuchardt 1 (1.1%) + Tim Harvey 1 (1.1%) + Nishanth Menon 1 (1.1%) + Quentin Schulz 1 (1.1%) + Eugen Hristev 1 (1.1%) + Andre Przywara 1 (1.1%) + Adam Ford 1 (1.1%) + Manorit Chawdhry 1 (1.1%) + AKASHI Takahiro 1 (1.1%) + Rasmus Villemoes 1 (1.1%) + Alvaro Fernando García 1 (1.1%) + Ryosuke Saito 1 (1.1%) + Yifan Zhao 1 (1.1%) + Udit Kumar 1 (1.1%) + ==================================== ===== + + +.. table:: Developers with the most report credits (total 25) + :widths: auto + + ==================================== ===== + Name Count + ==================================== ===== + Heinrich Schuchardt 3 (12.0%) + Milan P. Stanić 2 (8.0%) + Michal Simek 2 (8.0%) + Da Xue 2 (8.0%) + John Toomey 2 (8.0%) + Simon Glass 1 (4.0%) + Tom Rini 1 (4.0%) + Xavier Drudis Ferran 1 (4.0%) + Peter Robinson 1 (4.0%) + Alexey Brodkin 1 (4.0%) + Dan Carpenter 1 (4.0%) + Aniket Limaye 1 (4.0%) + Lorenzo Bianconi 1 (4.0%) + Thomas Nizan 1 (4.0%) + Vincent Stehlé 1 (4.0%) + Suniel Mahesh 1 (4.0%) + Mickael GARDET 1 (4.0%) + Harry Lockyer 1 (4.0%) + Eduard Strehlau 1 (4.0%) + ==================================== ===== + + +.. table:: Developers who gave the most report credits (total 25) + :widths: auto + + ==================================== ===== + Name Count + ==================================== ===== + Heinrich Schuchardt 4 (16.0%) + Nishanth Menon 4 (16.0%) + Simon Glass 3 (12.0%) + Marek Vasut 2 (8.0%) + AKASHI Takahiro 2 (8.0%) + Radhey Shyam Pandey 2 (8.0%) + Tom Rini 1 (4.0%) + Jonas Karlman 1 (4.0%) + Manorit Chawdhry 1 (4.0%) + Patrick Delaunay 1 (4.0%) + Fabio Estevam 1 (4.0%) + Siddharth Vadapalli 1 (4.0%) + Venkatesh Yadav Abbarapu 1 (4.0%) + Daniel Golle 1 (4.0%) + ==================================== ===== + + +.. table:: Top changeset contributors by employer + :widths: auto + + ==================================== ===== + Name Count + ==================================== ===== + (Unknown) 524 (34.2%) + Google, Inc. 273 (17.8%) + Texas Instruments 125 (8.2%) + NXP 78 (5.1%) + AMD 74 (4.8%) + Linaro 71 (4.6%) + DENX Software Engineering 70 (4.6%) + Konsulko Group 57 (3.7%) + Renesas Electronics 50 (3.3%) + ARM 36 (2.4%) + ST Microelectronics 33 (2.2%) + Weidmüller Interface GmbH & Co. KG 29 (1.9%) + Toradex 24 (1.6%) + Collabora Ltd. 17 (1.1%) + Amarula Solutions 10 (0.7%) + Samsung 8 (0.5%) + Broadcom 6 (0.4%) + Edgeble AI Technologies Pvt. Ltd. 6 (0.4%) + linutronix 6 (0.4%) + Siemens 6 (0.4%) + Phytec 5 (0.3%) + Rockchip 5 (0.3%) + Gentoo 4 (0.3%) + BayLibre SAS 2 (0.1%) + Bootlin 2 (0.1%) + Wind River 2 (0.1%) + NVidia 2 (0.1%) + Socionext Inc. 2 (0.1%) + Bosch 1 (0.1%) + Intel 1 (0.1%) + Xilinx 1 (0.1%) + ==================================== ===== + + +.. table:: Top lines changed by employer + :widths: auto + + ==================================== ===== + Name Count + ==================================== ===== + Texas Instruments 41676 (27.8%) + (Unknown) 36288 (24.2%) + Konsulko Group 15768 (10.5%) + Google, Inc. 12357 (8.2%) + ARM 8686 (5.8%) + Toradex 7854 (5.2%) + NXP 6045 (4.0%) + Linaro 4894 (3.3%) + AMD 4247 (2.8%) + ST Microelectronics 2642 (1.8%) + Weidmüller Interface GmbH & Co. KG 1455 (1.0%) + Collabora Ltd. 1327 (0.9%) + Rockchip 1178 (0.8%) + DENX Software Engineering 1147 (0.8%) + Renesas Electronics 916 (0.6%) + Phytec 877 (0.6%) + Broadcom 813 (0.5%) + Gentoo 790 (0.5%) + Siemens 292 (0.2%) + Edgeble AI Technologies Pvt. Ltd. 179 (0.1%) + linutronix 145 (0.1%) + Amarula Solutions 119 (0.1%) + Bosch 84 (0.1%) + Bootlin 65 (0.0%) + Samsung 32 (0.0%) + BayLibre SAS 21 (0.0%) + Xilinx 11 (0.0%) + Socionext Inc. 6 (0.0%) + Wind River 5 (0.0%) + NVidia 4 (0.0%) + Intel 3 (0.0%) + ==================================== ===== + + +.. table:: Employers with the most signoffs (total 305) + :widths: auto + + ==================================== ===== + Name Count + ==================================== ===== + NXP 67 (22.0%) + AMD 62 (20.3%) + (Unknown) 40 (13.1%) + Texas Instruments 32 (10.5%) + Renesas Electronics 24 (7.9%) + Toradex 16 (5.2%) + Linaro 14 (4.6%) + NVidia 10 (3.3%) + Canonical 8 (2.6%) + Google, Inc. 6 (2.0%) + ST Microelectronics 6 (2.0%) + Konsulko Group 4 (1.3%) + ARM 3 (1.0%) + Weidmüller Interface GmbH & Co. KG 3 (1.0%) + Collabora Ltd. 3 (1.0%) + DENX Software Engineering 3 (1.0%) + Rockchip 2 (0.7%) + Amarula Solutions 1 (0.3%) + Wind River 1 (0.3%) + ==================================== ===== + + +.. table:: Employers with the most hackers (total 212) + :widths: auto + + ==================================== ===== + Name Count + ==================================== ===== + (Unknown) 102 (48.1%) + Texas Instruments 15 (7.1%) + Linaro 13 (6.1%) + NXP 12 (5.7%) + AMD 11 (5.2%) + Toradex 6 (2.8%) + DENX Software Engineering 5 (2.4%) + Rockchip 5 (2.4%) + Renesas Electronics 4 (1.9%) + Weidmüller Interface GmbH & Co. KG 4 (1.9%) + Samsung 4 (1.9%) + ST Microelectronics 3 (1.4%) + Collabora Ltd. 3 (1.4%) + Phytec 3 (1.4%) + ARM 2 (0.9%) + Amarula Solutions 2 (0.9%) + Wind River 2 (0.9%) + Bootlin 2 (0.9%) + BayLibre SAS 2 (0.9%) + NVidia 1 (0.5%) + Google, Inc. 1 (0.5%) + Konsulko Group 1 (0.5%) + Broadcom 1 (0.5%) + Gentoo 1 (0.5%) + Siemens 1 (0.5%) + Edgeble AI Technologies Pvt. Ltd. 1 (0.5%) + linutronix 1 (0.5%) + Bosch 1 (0.5%) + Xilinx 1 (0.5%) + Socionext Inc. 1 (0.5%) + Intel 1 (0.5%) + ==================================== ===== diff --git a/doc/develop/uefi/u-boot_on_efi.rst b/doc/develop/uefi/u-boot_on_efi.rst index 0d49278..245b4af 100644 --- a/doc/develop/uefi/u-boot_on_efi.rst +++ b/doc/develop/uefi/u-boot_on_efi.rst @@ -31,14 +31,12 @@ Only x86 is supported at present. If you are using EFI on another architecture you may want to reconsider. However, much of the code is generic so could be ported. -U-Boot supports running as an EFI application for 32-bit EFI only. This is -not very useful since only a serial port is provided. You can look around at -memory and type 'help' but that is about it. +U-Boot supports running as an EFI application for both 32- and 64-bit EFI. -More usefully, U-Boot supports building itself as a payload for either 32-bit -or 64-bit EFI. U-Boot is packaged up and loaded in its entirety by EFI. Once -started, U-Boot changes to 32-bit mode (currently) and takes over the -machine. You can use devices, boot a kernel, etc. +U-Boot supports building itself as a payload for either 32-bit or 64-bit EFI. +U-Boot is packaged up and loaded in its entirety by EFI. Once started, U-Boot +changes to 32-bit mode (currently) and takes over the machine. You can use +devices, boot a kernel, etc. Build Instructions @@ -47,9 +45,9 @@ First choose a board that has EFI support and obtain an EFI implementation for that board. It will be either 32-bit or 64-bit. Alternatively, you can opt for using QEMU [1] and the OVMF [2], as detailed below. -To build U-Boot as an EFI application (32-bit EFI required), enable CONFIG_EFI -and CONFIG_EFI_APP. The efi-x86_app config (efi-x86_app32_defconfig) is set up -for this. Just build U-Boot as normal, e.g.:: +To build U-Boot as an EFI application, enable CONFIG_EFI and CONFIG_EFI_APP. +The efi-x86_app32 and efi-x86_app64 configs are set up for this. Just build +U-Boot as normal, e.g.:: make efi-x86_app32_defconfig make @@ -189,9 +187,9 @@ interrupts disabled at present. 32/64-bit ~~~~~~~~~ -While the EFI application can in principle be built as either 32- or 64-bit, -only 32-bit is currently supported. This means that the application can only -be used with 32-bit EFI. +While the EFI application can be built as either 32- or 64-bit, you need to be +careful to build the correct one so that your UEFI firmware can start it. Most +UEFI images are 64-bit at present. The payload stub can be build as either 32- or 64-bits. Only a small amount of code is built this way (see the extra- line in lib/efi/Makefile). @@ -345,8 +343,6 @@ This work could be extended in a number of ways: - Add ARM support -- Add 64-bit application support (in progress) - - Figure out how to solve the interrupt problem - Add more drivers to the application side (e.g.USB, environment access). diff --git a/doc/usage/cmd/bootflow.rst b/doc/usage/cmd/bootflow.rst index ead493d..9c5ea9c 100644 --- a/doc/usage/cmd/bootflow.rst +++ b/doc/usage/cmd/bootflow.rst @@ -514,8 +514,8 @@ the cmdline is word-wrapped here and some parts of the command line are elided:: root_hexdigest=78cc462cd45aecbcd49ca476587b4dee59aa1b00ba5ece58e2c29ec9acd914ab salt=8dec4dc80a75dd834a9b3175c674405e15b16a253fdfe05c79394ae5fd76f66a" noinitrd vt.global_cursor_default=0 - kern_guid=799c935b-ae62-d143-8493-816fa936eef7 add_efi_memmap boot=local - noresume noswap i915.modeset=1 ramoops.ecc=1 tpm_tis.force=0 + kern_guid=799c935b-ae62-d143-8493-816fa936eef7 add_efi_memmap + noresume i915.modeset=1 ramoops.ecc=1 tpm_tis.force=0 intel_pmc_core.warn_on_s0ix_failures=1 i915.enable_guc=3 i915.enable_dc=4 xdomain=0 swiotlb=65536 intel_iommu=on i915.enable_psr=1 usb-storage.quirks=13fe:6500:u diff --git a/doc/usage/cmd/load.rst b/doc/usage/cmd/load.rst index 1efee77..2c892ee 100644 --- a/doc/usage/cmd/load.rst +++ b/doc/usage/cmd/load.rst @@ -40,7 +40,7 @@ bytes pos number of bytes to skip -addr, bytes, pos are hexadecimal numbers. +part, addr, bytes, pos are hexadecimal numbers. Example ------- diff --git a/doc/usage/fit/howto.rst b/doc/usage/fit/howto.rst index c933703..def12a7 100644 --- a/doc/usage/fit/howto.rst +++ b/doc/usage/fit/howto.rst @@ -21,8 +21,8 @@ important that the dtc used has support for binary includes -- refer to:: for its latest version. mkimage (together with dtc) takes as input an image source file, which describes the contents of the image and defines its various properties used during booting. By convention, image source file -has the ".its" extension, also, the details of its format are given in -doc/uImage.FIT/source_file_format.txt. The actual data that is to be included in +has the ".its" extension, also, the details of its format are provided in +:doc:`source_file_format`. The actual data that is to be included in the uImage (kernel, ramdisk, etc.) is specified in the image source file in the form of paths to appropriate data files. The outcome of the image creation process is a binary file (by convention with the ".itb" extension) that diff --git a/drivers/clk/at91/sam9x60.c b/drivers/clk/at91/sam9x60.c index e2f7244..d858c86 100644 --- a/drivers/clk/at91/sam9x60.c +++ b/drivers/clk/at91/sam9x60.c @@ -429,8 +429,8 @@ static int sam9x60_clk_probe(struct udevice *dev) if (!base) return -EINVAL; - memset(muxallocs, 0, ARRAY_SIZE(muxallocs)); - memset(clkmuxallocs, 0, ARRAY_SIZE(clkmuxallocs)); + memset(muxallocs, 0, sizeof(muxallocs)); + memset(clkmuxallocs, 0, sizeof(clkmuxallocs)); ret = clk_get_by_index(dev, 0, &clk); if (ret) diff --git a/drivers/clk/at91/sama7g5.c b/drivers/clk/at91/sama7g5.c index 3abd220..3e62fb1 100644 --- a/drivers/clk/at91/sama7g5.c +++ b/drivers/clk/at91/sama7g5.c @@ -1115,8 +1115,8 @@ static int sama7g5_clk_probe(struct udevice *dev) if (IS_ERR(base)) return PTR_ERR(base); - memset(muxallocs, 0, ARRAY_SIZE(muxallocs)); - memset(clkmuxallocs, 0, ARRAY_SIZE(clkmuxallocs)); + memset(muxallocs, 0, sizeof(muxallocs)); + memset(clkmuxallocs, 0, sizeof(clkmuxallocs)); ret = clk_get_by_index(dev, 0, &clk); if (ret) diff --git a/drivers/i2c/mtk_i2c.c b/drivers/i2c/mtk_i2c.c index 2f331d3..5592fe9 100644 --- a/drivers/i2c/mtk_i2c.c +++ b/drivers/i2c/mtk_i2c.c @@ -621,7 +621,7 @@ static int mtk_i2c_do_transfer(struct mtk_i2c_priv *priv, i2c_writel(priv, REG_INTR_MASK, ~(restart_flag | I2C_HS_NACKERR | I2C_ACKERR | I2C_TRANSAC_COMP)); - if (!tmo && trans_error != 0) { + if (tmo || trans_error != 0) { if (tmo) { ret = -ETIMEDOUT; if (!priv->filter_msg) diff --git a/drivers/mtd/nand/raw/atmel/nand-controller.c b/drivers/mtd/nand/raw/atmel/nand-controller.c index 2b29c8d..fa962ba 100644 --- a/drivers/mtd/nand/raw/atmel/nand-controller.c +++ b/drivers/mtd/nand/raw/atmel/nand-controller.c @@ -1600,10 +1600,13 @@ static struct atmel_nand *atmel_nand_create(struct atmel_nand_controller *nc, nand->cs[i].rb.type = ATMEL_NAND_NATIVE_RB; nand->cs[i].rb.id = val; } else { - gpio_request_by_name_nodev(np, "rb-gpios", 0, - &nand->cs[i].rb.gpio, - GPIOD_IS_IN); - nand->cs[i].rb.type = ATMEL_NAND_GPIO_RB; + ret = gpio_request_by_name_nodev(np, "rb-gpios", 0, + &nand->cs[i].rb.gpio, + GPIOD_IS_IN); + if (ret && ret != -ENOENT) + dev_err(nc->dev, "Failed to get R/B gpio (err = %d)\n", ret); + if (!ret) + nand->cs[i].rb.type = ATMEL_NAND_GPIO_RB; } gpio_request_by_name_nodev(np, "cs-gpios", 0, diff --git a/drivers/net/sni_netsec.c b/drivers/net/sni_netsec.c index 9780f20..71afe78 100644 --- a/drivers/net/sni_netsec.c +++ b/drivers/net/sni_netsec.c @@ -286,6 +286,8 @@ struct netsec_rx_pkt_info { bool err_flag; }; +static int netsec_reset_hardware(struct netsec_priv *priv, bool load_ucode); + static void netsec_write_reg(struct netsec_priv *priv, u32 reg_addr, u32 val) { writel(val, priv->ioaddr + reg_addr); @@ -532,18 +534,11 @@ static int netsec_mac_update_to_phy_state(struct netsec_priv *priv) return 0; } -static int netsec_start_gmac(struct netsec_priv *priv) +static int netsec_reset_gmac(struct netsec_priv *priv) { u32 value = 0; int ret; - if (priv->max_speed != SPEED_1000) - value = (NETSEC_GMAC_MCR_REG_CST | - NETSEC_GMAC_MCR_REG_HALF_DUPLEX_COMMON); - - if (netsec_set_mac_reg(priv, GMAC_REG_MCR, value)) - return -ETIMEDOUT; - if (netsec_set_mac_reg(priv, GMAC_REG_BMR, NETSEC_GMAC_BMR_REG_RESET)) return -ETIMEDOUT; @@ -558,10 +553,47 @@ static int netsec_start_gmac(struct netsec_priv *priv) if (value & NETSEC_GMAC_BMR_REG_SWR) return -EAGAIN; + /** + * NETSEC GMAC sometimes shows the peculiar behaviour where + * MAC_REG_DESC_SOFT_RST never been cleared, resulting in the loss of + * sending packets. + * + * Workaround: + * Restart NETSEC and PHY, retry again. + */ netsec_write_reg(priv, MAC_REG_DESC_SOFT_RST, 1); - if (netsec_wait_while_busy(priv, MAC_REG_DESC_SOFT_RST, 1)) + udelay(1000); + if (netsec_read_reg(priv, MAC_REG_DESC_SOFT_RST)) { + phy_shutdown(priv->phydev); + netsec_reset_hardware(priv, false); + phy_startup(priv->phydev); + return -EAGAIN; + } + return 0; +} + +static int netsec_start_gmac(struct netsec_priv *priv) +{ + u32 value = 0; + u32 failure = 0; + int ret; + + if (priv->max_speed != SPEED_1000) + value = (NETSEC_GMAC_MCR_REG_CST | + NETSEC_GMAC_MCR_REG_HALF_DUPLEX_COMMON); + + if (netsec_set_mac_reg(priv, GMAC_REG_MCR, value)) return -ETIMEDOUT; + /* Reset GMAC */ + while ((ret = netsec_reset_gmac(priv)) == -EAGAIN && ++failure < 3) + ; + + if (ret) { + pr_err("%s: failed to reset gmac(err=%d).\n", __func__, ret); + return ret; + } + netsec_write_reg(priv, MAC_REG_DESC_INIT, 1); if (netsec_wait_while_busy(priv, MAC_REG_DESC_INIT, 1)) return -ETIMEDOUT; diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 27b4b9d..6cb6598 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -218,6 +218,7 @@ config DEBUG_UART choice prompt "Select which UART will provide the debug UART" depends on DEBUG_UART + default DEBUG_SBI_CONSOLE if RISCV_SMODE default DEBUG_UART_NS16550 config DEBUG_UART_ALTERA_JTAGUART @@ -289,11 +290,13 @@ config DEBUG_EFI_CONSOLE config DEBUG_SBI_CONSOLE bool "SBI" - depends on SBI_V01 + depends on RISCV_SMODE help Select this to enable a debug console which calls back to SBI to output to the console. This can be useful for early debugging of U-Boot when running on top of SBI (Supervisor Binary Interface). + This implementation of the debug UART is not available while in + M-mode (e.g. during SPL). config DEBUG_UART_S5P bool "Samsung S5P" diff --git a/drivers/serial/serial_sbi.c b/drivers/serial/serial_sbi.c index b9f35ed..a51a96c 100644 --- a/drivers/serial/serial_sbi.c +++ b/drivers/serial/serial_sbi.c @@ -3,6 +3,8 @@ #include <debug_uart.h> #include <asm/sbi.h> +#ifdef CONFIG_SBI_V01 + static inline void _debug_uart_init(void) { } @@ -13,4 +15,22 @@ static inline void _debug_uart_putc(int c) sbi_console_putchar(c); } +#else + +static int sbi_dbcn_available; + +static inline void _debug_uart_init(void) +{ + if (CONFIG_IS_ENABLED(RISCV_SMODE)) + sbi_dbcn_available = sbi_probe_extension(SBI_EXT_DBCN); +} + +static inline void _debug_uart_putc(int ch) +{ + if (CONFIG_IS_ENABLED(RISCV_SMODE) && sbi_dbcn_available) + sbi_dbcn_write_byte(ch); +} + +#endif + DEBUG_UART_FUNCS diff --git a/drivers/thermal/imx_tmu.c b/drivers/thermal/imx_tmu.c index 97efc55..4721cfb 100644 --- a/drivers/thermal/imx_tmu.c +++ b/drivers/thermal/imx_tmu.c @@ -37,6 +37,7 @@ DECLARE_GLOBAL_DATA_PTR; #define TER_ADC_PD 0x40000000 #define TER_ALPF 0x3 +#define IMX_TMU_POLLING_DELAY_MS 5000 /* * i.MX TMU Registers */ @@ -237,8 +238,8 @@ int imx_tmu_get_temp(struct udevice *dev, int *temp) return ret; while (cpu_tmp >= pdata->alert) { - dev_info(dev, "CPU Temperature (%dC) has beyond alert (%dC), close to critical (%dC) waiting...\n", - cpu_tmp, pdata->alert, pdata->critical); + dev_crit(dev, "CPU Temperature (%dC) is beyond alert (%dC), close to critical (%dC) waiting...\n", + cpu_tmp / 1000, pdata->alert / 1000, pdata->critical / 1000); mdelay(pdata->polling_delay); ret = read_temperature(dev, &cpu_tmp); if (ret) @@ -574,6 +575,8 @@ static int imx_tmu_parse_fdt(struct udevice *dev) dev_dbg(dev, "%s\n", __func__); + pdata->polling_delay = IMX_TMU_POLLING_DELAY_MS; + if (pdata->zone_node) { pdata->regs = (union tmu_regs *)dev_read_addr_ptr(dev); @@ -602,7 +605,8 @@ static int imx_tmu_parse_fdt(struct udevice *dev) dev_dbg(dev, "args.args_count %d, id %d\n", args.args_count, pdata->id); - pdata->polling_delay = dev_read_u32_default(dev, "polling-delay", 1000); + pdata->polling_delay = dev_read_u32_default(dev, "polling-delay", + IMX_TMU_POLLING_DELAY_MS); trips_np = ofnode_path("/thermal-zones/cpu-thermal/trips"); ofnode_for_each_subnode(trips_np, trips_np) { diff --git a/drivers/timer/riscv_timer.c b/drivers/timer/riscv_timer.c index 3627ed7..28a6a68 100644 --- a/drivers/timer/riscv_timer.c +++ b/drivers/timer/riscv_timer.c @@ -13,6 +13,7 @@ #include <common.h> #include <dm.h> #include <errno.h> +#include <fdt_support.h> #include <timer.h> #include <asm/csr.h> @@ -53,9 +54,26 @@ u64 notrace timer_early_get_count(void) static int riscv_timer_probe(struct udevice *dev) { struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev); + u32 rate; - /* clock frequency was passed from the cpu driver as driver data */ - uc_priv->clock_rate = dev->driver_data; + /* When this function was called from the CPU driver, clock + * frequency is passed as driver data. + */ + rate = dev->driver_data; + + /* When called from an FDT match, the rate needs to be looked up. */ + if (!rate && gd->fdt_blob) { + rate = fdt_getprop_u32_default(gd->fdt_blob, + "/cpus", "timebase-frequency", 0); + } + + uc_priv->clock_rate = rate; + + /* With rate==0, timer uclass post_probe might later fail with -EINVAL. + * Give a hint at the cause for debugging. + */ + if (!rate) + log_err("riscv_timer_probe with invalid clock rate 0!\n"); return 0; } @@ -64,9 +82,15 @@ static const struct timer_ops riscv_timer_ops = { .get_count = riscv_timer_get_count, }; +static const struct udevice_id riscv_timer_ids[] = { + { .compatible = "riscv,timer", }, + { } +}; + U_BOOT_DRIVER(riscv_timer) = { .name = "riscv_timer", .id = UCLASS_TIMER, + .of_match = of_match_ptr(riscv_timer_ids), .probe = riscv_timer_probe, .ops = &riscv_timer_ops, .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/usb/dwc3/dwc3-layerscape.c b/drivers/usb/dwc3/dwc3-layerscape.c index 79cf71f..c32df23 100644 --- a/drivers/usb/dwc3/dwc3-layerscape.c +++ b/drivers/usb/dwc3/dwc3-layerscape.c @@ -134,8 +134,7 @@ U_BOOT_DRIVER(dwc3_layerscape_peripheral) = { }; #endif -#if defined(CONFIG_SPL_USB_HOST_SUPPORT) || \ - !defined(CONFIG_SPL_BUILD) && defined(CONFIG_USB_HOST) +#if CONFIG_IS_ENABLED(USB_HOST) static int dwc3_layerscape_host_probe(struct udevice *dev) { struct xhci_hcor *hcor; @@ -194,7 +193,7 @@ static int dwc3_layerscape_bind(struct udevice *dev) driver = "dwc3-layerscape-peripheral"; break; #endif -#if defined(CONFIG_SPL_USB_HOST_SUPPORT) || !defined(CONFIG_SPL_BUILD) +#if CONFIG_IS_ENABLED(USB_HOST) case USB_DR_MODE_HOST: dev_dbg(dev, "Using host mode\n"); driver = "dwc3-layerscape-host"; diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h deleted file mode 100644 index 54eea32..0000000 --- a/include/configs/nokia_rx51.h +++ /dev/null @@ -1,174 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * (C) Copyright 2011-2012 - * Pali Rohár <pali@kernel.org> - * - * (C) Copyright 2010 - * Alistair Buxton <a.j.buxton@gmail.com> - * - * Derived from Beagle Board code: - * (C) Copyright 2006-2008 - * Texas Instruments. - * Richard Woodruff <r-woodruff2@ti.com> - * Syed Mohammed Khasim <x0khasim@ti.com> - * - * Configuration settings for the Nokia RX-51 aka N900. - */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -/* - * High Level Configuration Options - */ - -#include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap.h> -#include <asm/arch/mem.h> -#include <linux/stringify.h> - -/* Clock Defines */ -#define V_OSCK 26000000 /* Clock output from T2 */ -#define V_SCLK (V_OSCK >> 1) - -/* - * Hardware drivers - */ - -/* - * NS16550 Configuration - */ -#define V_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */ - -#define CFG_SYS_NS16550_CLK V_NS16550_CLK - -/* - * select serial console configuration - */ -#define CFG_SYS_NS16550_COM3 OMAP34XX_UART3 - -#define CFG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, 115200 } - -#define GPIO_SLIDE 71 - -/* - * Board ONENAND Info. - */ - -#define CFG_SYS_ONENAND_BASE ONENAND_MAP - -/* Environment information */ -#define CFG_EXTRA_ENV_SETTINGS \ - "usbtty=cdc_acm\0" \ - "stdin=usbtty,serial,keyboard\0" \ - "stdout=usbtty,serial,vidconsole\0" \ - "stderr=usbtty,serial,vidconsole\0" \ - "slide=gpio input " __stringify(GPIO_SLIDE) "\0" \ - "switchmmc=mmc dev ${mmcnum}\0" \ - "kernaddr=0x82008000\0" \ - "initrdaddr=0x84008000\0" \ - "scriptaddr=0x86008000\0" \ - "fileloadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ - "fileload=${mmctype}load mmc ${mmcnum}:${mmcpart} " \ - "${fileloadaddr} ${mmcfile}\0" \ - "kernload=setenv fileloadaddr ${kernaddr};" \ - "setenv mmcfile ${mmckernfile};" \ - "run fileload\0" \ - "initrdload=setenv fileloadaddr ${initrdaddr};" \ - "setenv mmcfile ${mmcinitrdfile};" \ - "run fileload\0" \ - "scriptload=setenv fileloadaddr ${scriptaddr};" \ - "setenv mmcfile ${mmcscriptfile};" \ - "run fileload\0" \ - "scriptboot=echo Running ${mmcscriptfile} from mmc " \ - "${mmcnum}:${mmcpart} ...; source ${scriptaddr}\0" \ - "kernboot=echo Booting ${mmckernfile} from mmc " \ - "${mmcnum}:${mmcpart} ...; bootm ${kernaddr} || " \ - "bootz ${kernaddr}\0" \ - "kerninitrdboot=echo Booting ${mmckernfile} ${mmcinitrdfile} from mmc "\ - "${mmcnum}:${mmcpart} ...; bootm ${kernaddr} ${initrdaddr} || " \ - "bootz ${kernaddr} ${initrdaddr}\0" \ - "attachboot=echo Booting attached kernel image ...;" \ - "setenv setup_omap_atag 1;" \ - "bootm ${attkernaddr} || bootz ${attkernaddr};" \ - "setenv setup_omap_atag\0" \ - "trymmcscriptboot=run switchmmc && run scriptload && run scriptboot\0" \ - "trymmckernboot=run switchmmc && run kernload && run kernboot\0" \ - "trymmckerninitrdboot=run switchmmc && run initrdload && " \ - "run kernload && run kerninitrdboot\0" \ - "trymmcpartboot=setenv mmcscriptfile boot.scr; run trymmcscriptboot;" \ - "setenv mmckernfile uImage; run trymmckernboot;" \ - "setenv mmckernfile zImage; run trymmckernboot\0" \ - "trymmcallpartboot=setenv mmcpart 1; run trymmcpartboot;" \ - "setenv mmcpart 2; run trymmcpartboot;" \ - "setenv mmcpart 3; run trymmcpartboot;" \ - "setenv mmcpart 4; run trymmcpartboot\0" \ - "trymmcboot=if run switchmmc; then " \ - "setenv mmctype fat;" \ - "run trymmcallpartboot;" \ - "setenv mmctype ext4;" \ - "run trymmcallpartboot;" \ - "fi\0" \ - "emmcboot=setenv mmcnum 1; run trymmcboot\0" \ - "sdboot=setenv mmcnum 0; run trymmcboot\0" \ - "trymmcbootmenu=setenv mmctype fat && run trymmcscriptboot || " \ - "setenv mmctype ext4 && run trymmcscriptboot\0" \ - "preboot=setenv mmcpart 1; setenv mmcscriptfile bootmenu.scr;" \ - "setenv mmcnum 0 && run trymmcbootmenu || " \ - "setenv mmcnum 1 && run trymmcbootmenu;" \ - "if run slide; then true; else " \ - "setenv bootmenu_delay 0;" \ - "setenv bootdelay 0;" \ - "fi\0" \ - "menucmd=bootmenu\0" \ - "bootmenu_0=Attached kernel=run attachboot\0" \ - "bootmenu_1=Internal eMMC=run emmcboot\0" \ - "bootmenu_2=External SD card=run sdboot\0" \ - "bootmenu_3=U-Boot boot order=boot\0" \ - "bootmenu_delay=30\0" \ - "" - -#define CFG_POSTBOOTMENU \ - "echo;" \ - "echo Extra commands:;" \ - "echo run sdboot - Boot from SD card slot.;" \ - "echo run emmcboot - Boot internal eMMC memory.;" \ - "echo run attachboot - Boot attached kernel image.;" \ - "echo" - -/* - * OMAP3 has 12 GP timers, they can be driven by the system clock - * (12/13/16.8/19.2/38.4MHz) or by 32KHz clock. We use 13MHz (V_SCLK). - * This rate is divided by a local divisor. - */ -#define CFG_SYS_TIMERBASE (OMAP34XX_GPT2) - -/* - * Physical Memory Map - */ -#define PHYS_SDRAM_1 OMAP34XX_SDRC_CS0 - -/* - * FLASH and environment organization - */ - -#define CFG_SYS_SDRAM_BASE PHYS_SDRAM_1 -#define CFG_SYS_INIT_RAM_ADDR 0x4020f800 -#define CFG_SYS_INIT_RAM_SIZE 0x800 - -/* - * Attached kernel image - */ - -#define SDRAM_SIZE 0x10000000 /* 256 MB */ -#define SDRAM_END (CFG_SYS_SDRAM_BASE + SDRAM_SIZE) - -#define IMAGE_MAXSIZE 0x1FF800 /* 2 MB - 2 kB */ -#define KERNEL_OFFSET 0x40000 /* 256 kB */ -#define KERNEL_MAXSIZE (IMAGE_MAXSIZE-KERNEL_OFFSET) -#define KERNEL_ADDRESS (SDRAM_END-KERNEL_MAXSIZE) - -/* Reserve protected RAM for attached kernel */ -#define CFG_PRAM ((KERNEL_MAXSIZE >> 10)+1) - -#endif /* __CONFIG_H */ diff --git a/include/env/ti/ti_common.env b/include/env/ti/ti_common.env index e87a41a..f5d8421 100644 --- a/include/env/ti/ti_common.env +++ b/include/env/ti/ti_common.env @@ -15,10 +15,10 @@ boot_fit=0 addr_fit=0x90000000 name_fit=fitImage update_to_fit=setenv loadaddr ${addr_fit}; setenv bootfile ${name_fit} -get_overlaystring= - for overlay in $name_overlays; - do; - setenv overlaystring ${overlaystring}'#'${overlay}; +get_fit_overlaystring= + for overlay in $name_overlays; do; + setexpr name_fit_overlay gsub / _ conf-${overlay}; + setenv overlaystring ${overlaystring}'#'${name_fit_overlay}; done; get_fit_config=setexpr name_fit_config gsub / _ conf-${fdtfile} run_fit=run get_fit_config; bootm ${addr_fit}#${name_fit_config}${overlaystring} @@ -28,7 +28,7 @@ bootcmd_ti_mmc= run main_cpsw0_qsgmii_phyinit; run boot_rprocs; #endif if test ${boot_fit} -eq 1; - then run get_fit_${boot}; run get_overlaystring; run run_fit; + then run get_fit_${boot}; run get_fit_overlaystring; run run_fit; else; run get_kern_${boot}; run get_fdt_${boot}; run get_overlay_${boot}; run run_kern; fi; diff --git a/include/expo.h b/include/expo.h index a2b3a71..9d2e817 100644 --- a/include/expo.h +++ b/include/expo.h @@ -670,7 +670,7 @@ int expo_apply_theme(struct expo *exp, ofnode node); * * Build a complete expo from a description in the provided devicetree. * - * See doc/developer/expo.rst for a description of the format + * See doc/develop/expo.rst for a description of the format * * @root: Root node for expo description * @expp: Returns the new expo diff --git a/include/spl.h b/include/spl.h index 57da148..0fedddd 100644 --- a/include/spl.h +++ b/include/spl.h @@ -862,7 +862,7 @@ void __noreturn spl_optee_entry(void *arg0, void *arg1, void *arg2, void *arg3); /** * spl_invoke_opensbi - boot using a RISC-V OpenSBI image */ -void spl_invoke_opensbi(struct spl_image_info *spl_image); +void __noreturn spl_invoke_opensbi(struct spl_image_info *spl_image); /** * board_return_to_bootrom - allow for boards to continue with the boot ROM diff --git a/include/timer.h b/include/timer.h index 311ce6b..091d8df 100644 --- a/include/timer.h +++ b/include/timer.h @@ -55,10 +55,10 @@ u64 timer_conv_64(u32 count); int timer_get_count(struct udevice *dev, u64 *count); /** - * timer_get_rate() - Get the timer input clock frequency + * timer_get_rate() - Get the timer input clock frequency in Hz * @dev: The timer device * - * Return: the timer input clock frequency + * Return: the timer input clock frequency in Hz */ unsigned long timer_get_rate(struct udevice *dev); @@ -87,7 +87,7 @@ struct timer_ops { /** * struct timer_dev_priv - information about a device used by the uclass * - * @clock_rate: the timer input clock frequency + * @clock_rate: the timer input clock frequency in Hz */ struct timer_dev_priv { unsigned long clock_rate; @@ -35,7 +35,8 @@ struct pkt_qd { * The actual packet bufers are in the kernel space, and are * expected to be overwritten by the downloaded image. */ -static struct pkt_qd pkt_q[PKTBUFSRX / 4]; +#define PKTQ_SZ (PKTBUFSRX / 4) +static struct pkt_qd pkt_q[PKTQ_SZ]; static int pkt_q_idx; static unsigned long content_length; static unsigned int packets; @@ -202,6 +203,13 @@ static void wget_connected(uchar *pkt, unsigned int tcp_seq_num, pkt_q[pkt_q_idx].tcp_seq_num = tcp_seq_num; pkt_q[pkt_q_idx].len = len; pkt_q_idx++; + + if (pkt_q_idx >= PKTQ_SZ) { + printf("wget: Fatal error, queue overrun!\n"); + net_set_state(NETLOOP_FAIL); + + return; + } } else { debug_cond(DEBUG_WGET, "wget: Connected HTTP Header %p\n", pkt); /* sizeof(http_eom) - 1 is the string length of (http_eom) */ diff --git a/test/nokia_rx51_test.sh b/test/nokia_rx51_test.sh deleted file mode 100755 index dca9ef3..0000000 --- a/test/nokia_rx51_test.sh +++ /dev/null @@ -1,420 +0,0 @@ -#!/bin/bash -e -# SPDX-License-Identifier: GPL-2.0+ -# (C) 2020 Pali Rohár <pali@kernel.org> - -# External tools needed for this test: -echo ' - wget - git - truncate - tar - dpkg - dd - make - gcc - arm-linux-gnueabi-gcc - fakeroot (homepage http://fakeroot-ng.lingnu.com/) - mcopy (from mtools, homepage http://www.gnu.org/software/mtools/) - mformat (from mtools, homepage http://www.gnu.org/software/mtools/) - /usr/sbin/mkfs.ubifs (from mtd-utils, homepage http://www.linux-mtd.infradead.org/) - /usr/sbin/ubinize (from mtd-utils, homepage http://www.linux-mtd.infradead.org/) - /lib/ld-linux.so.2 (32-bit x86 version of LD loader, needed for qflasher) -' | while read tool info; do - if test -z "$tool"; then continue; fi - if ! which $tool 1>/dev/null 2>&1; then - echo "Tool $tool was not found and is required to run this test" - echo "First install $tool $info" - exit 1 - fi -done || exit 1 - -echo -echo "============================================================" -echo "========== Compiling U-Boot for Nokia RX-51 board ==========" -echo "============================================================" -echo - -# First compile u-boot-ubifs.bin binary with UBI/UBIFS support for Nokia RX-51 board according to doc/board/nokia/rx51.rst -make nokia_rx51_config -cat >> .config << EOF -CONFIG_CMD_UBI=y -CONFIG_CMD_UBIFS=y -CONFIG_MTD_UBI_BEB_LIMIT=10 -EOF -make olddefconfig -make -j4 u-boot.bin CROSS_COMPILE=arm-linux-gnueabi- -mv u-boot.bin u-boot-ubifs.bin - -# Then compile standard u-boot.bin binary for Nokia RX-51 board -make nokia_rx51_config -make -j4 u-boot.bin CROSS_COMPILE=arm-linux-gnueabi- - -# And then do all stuff in temporary directory -mkdir -p nokia_rx51_tmp -cd nokia_rx51_tmp - -test -f mkimage || ln -s ../tools/mkimage . -test -f u-boot.bin || ln -s ../u-boot.bin . -test -f u-boot-ubifs.bin || ln -s ../u-boot-ubifs.bin . - -echo -echo "==========================================================================" -echo "========== Downloading and compiling qemu from qemu-linaro fork ==========" -echo "==========================================================================" -echo - -# Download and compile linaro version qemu which has support for n900 machine -# Last working commit is 8f8d8e0796efe1a6f34cdd83fb798f3c41217ec1 -if ! test -f qemu-system-arm; then - test -d qemu-linaro || git clone https://git.linaro.org/qemu/qemu-linaro.git - cd qemu-linaro - git checkout 8f8d8e0796efe1a6f34cdd83fb798f3c41217ec1 - ./configure --enable-system --target-list=arm-softmmu --python=/usr/bin/python2.7 --disable-sdl --disable-gtk --disable-curses --audio-drv-list= --audio-card-list= --disable-werror --disable-xen --disable-xen-pci-passthrough --disable-brlapi --disable-vnc --disable-curl --disable-slirp --disable-kvm --disable-user --disable-linux-user --disable-bsd-user --disable-guest-base --disable-uuid --disable-vde --disable-linux-aio --disable-cap-ng --disable-attr --disable-blobs --disable-docs --disable-spice --disable-libiscsi --disable-smartcard-nss --disable-usb-redir --disable-guest-agent --disable-seccomp --disable-glusterfs --disable-nptl --disable-fdt - make -j4 - cd .. - ln -s qemu-linaro/arm-softmmu/qemu-system-arm . -fi - -echo -echo "===================================================" -echo "========== Downloading external binaries ==========" -echo "===================================================" -echo - -# Download qflasher and nolo images -# This is proprietary qemu flasher tool with first stage images, but license allows non-commercial redistribution -if ! test -f qflasher || ! test -f xloader-qemu.bin || ! test -f secondary-qemu.bin; then - test -f qemu-n900.tar.gz || wget -c http://repository.maemo.org/qemu-n900/qemu-n900.tar.gz - tar -xf qemu-n900.tar.gz -fi - -# Download Maemo script u-boot-gen-combined -if ! test -f u-boot-gen-combined; then - test -d u-boot-maemo || git clone https://github.com/pali/u-boot-maemo.git - chmod +x u-boot-maemo/debian/u-boot-gen-combined - ln -s u-boot-maemo/debian/u-boot-gen-combined . -fi - -# Download Maemo fiasco kernel -if ! test -d kernel_2.6.28; then - test -f kernel_2.6.28-20103103+0m5_armel.deb || wget -c http://repository.maemo.org/pool/maemo5.0/free/k/kernel/kernel_2.6.28-20103103+0m5_armel.deb - dpkg -x kernel_2.6.28-20103103+0m5_armel.deb kernel_2.6.28 -fi - -# Download Maemo libc -if ! test -d libc6_2.5.1; then - test -f libc6_2.5.1-1eglibc27+0m5_armel.deb || wget -c http://repository.maemo.org/pool/maemo5.0/free/g/glibc/libc6_2.5.1-1eglibc27+0m5_armel.deb - dpkg -x libc6_2.5.1-1eglibc27+0m5_armel.deb libc6_2.5.1 -fi - -# Download Maemo busybox -if ! test -d busybox_1.10.2; then - test -f busybox_1.10.2.legal-1osso30+0m5_armel.deb || wget -c http://repository.maemo.org/pool/maemo5.0/free/b/busybox/busybox_1.10.2.legal-1osso30+0m5_armel.deb - dpkg -x busybox_1.10.2.legal-1osso30+0m5_armel.deb busybox_1.10.2 -fi - -echo -echo "=======================================" -echo "========== Generating images ==========" -echo "=======================================" -echo - -# Generate kernel image in zImage and uImage format from FIASCO format -dd if=kernel_2.6.28/boot/zImage-2.6.28-20103103+0m5.fiasco of=zImage-2.6.28-omap1 skip=95 bs=1 -./mkimage -A arm -O linux -T kernel -C none -a 80008000 -e 80008000 -n zImage-2.6.28-omap1 -d zImage-2.6.28-omap1 uImage-2.6.28-omap1 - -# Generate rootfs directory -mkdir -p rootfs -mkdir -p rootfs/dev/ -mkdir -p rootfs/bin/ -mkdir -p rootfs/sbin/ -mkdir -p rootfs/lib/ -cp -a busybox_1.10.2/bin/busybox rootfs/bin/ -cp -a libc6_2.5.1/lib/ld-linux.so.3 rootfs/lib/ -cp -a libc6_2.5.1/lib/ld-2.5.so rootfs/lib/ -cp -a libc6_2.5.1/lib/libc.so.6 rootfs/lib/ -cp -a libc6_2.5.1/lib/libc-2.5.so rootfs/lib/ -cp -a libc6_2.5.1/lib/libcrypt.so.1 rootfs/lib/ -cp -a libc6_2.5.1/lib/libcrypt-2.5.so rootfs/lib/ -test -f rootfs/bin/sh || ln -sf busybox rootfs/bin/sh -test -f rootfs/sbin/poweroff || ln -sf ../bin/busybox rootfs/sbin/poweroff -cat > rootfs/sbin/preinit << EOF -#!/bin/sh -echo -echo "Successfully booted" -echo -/sbin/poweroff -f -EOF -chmod +x rootfs/sbin/preinit - -# Generate ubifs image from rootfs directory -# NOTE: Character device on host filesystem can be created only by root -# But we do not need it on host filesystem, just in ubifs image -# So run mknod and mkfs.ubifs commands under fakeroot program -# which via LD_PRELOAD simulate mknod() and stat() functions -# so mkfs.ubifs will see dev/console as character device and -# put it correctly as character device into final ubifs image -# Therefore we can run whole script as non-root nobody user -fakeroot sh -c ' - rm -f rootfs/dev/console; - mknod rootfs/dev/console c 5 1; - /usr/sbin/mkfs.ubifs -m 2048 -e 129024 -c 2047 -r rootfs ubifs.img; -' - -# Generate ubi image with rootfs on first volume -cat > ubi.ini << EOF -[rootfs] -mode=ubi -image=ubifs.img -vol_id=0 -vol_size=230MiB # 1870 LEBs -vol_type=dynamic -vol_name=rootfs -vol_alignment=1 -vol_flags=autoresize -EOF -/usr/sbin/ubinize -o ubi.img -p 128KiB -m 2048 -s 512 ubi.ini - -# Generate ubi image with rootfs on first volume and kernel in zImage format on second volume for UBI booting -cp ubi.ini ubi_with_kernel.ini -cat >> ubi_with_kernel.ini << EOF -[kernel] -mode=ubi -image=zImage-2.6.28-omap1 -vol_id=1 -vol_size=2MiB -vol_type=dynamic -vol_name=kernel -vol_alignment=1 -EOF -/usr/sbin/ubinize -o ubi_with_kernel.img -p 128KiB -m 2048 -s 512 ubi_with_kernel.ini - -# Generate bootmenu for U-Boot serial console testing -cat > bootmenu_uboot << EOF -setenv bootmenu_0 'Serial console test=echo; echo "Testing serial console"; echo; echo "Successfully booted"; echo; poweroff'; -setenv bootmenu_1; -setenv bootmenu_delay 1; -setenv bootdelay 1; -EOF -./mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n bootmenu_uboot -d bootmenu_uboot bootmenu_uboot.scr - -# Generate bootmenu for eMMC booting (uImage) -cat > bootmenu_emmc << EOF -setenv bootmenu_0 'uImage-2.6.28-omap1 from eMMC=setenv mmcnum 1; setenv mmcpart 1; setenv mmctype fat; setenv bootargs; setenv setup_omap_atag 1; setenv mmckernfile uImage-2.6.28-omap1; run trymmckernboot'; -setenv bootmenu_1; -setenv bootmenu_delay 1; -setenv bootdelay 1; -EOF -./mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n bootmenu_emmc -d bootmenu_emmc bootmenu_emmc.scr - -# Generate bootmenu for eMMC booting (zImage) -cat > bootmenu_emmc2 << EOF -setenv bootmenu_0 'zImage-2.6.28-omap1 from eMMC=setenv mmcnum 1; setenv mmcpart 1; setenv mmctype fat; setenv bootargs; setenv setup_omap_atag 1; setenv mmckernfile zImage-2.6.28-omap1; run trymmckernboot'; -setenv bootmenu_1; -setenv bootmenu_delay 1; -setenv bootdelay 1; -EOF -./mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n bootmenu_emmc2 -d bootmenu_emmc2 bootmenu_emmc2.scr - -# Generate bootmenu for OneNAND booting (uImage) -cat > bootmenu_nand << EOF -setenv bootmenu_0 'uImage-2.6.28-omap1 from OneNAND=setenv bootargs; setenv setup_omap_atag 1; mtd read initfs \${kernaddr} && bootm \${kernaddr}'; -setenv bootmenu_1; -setenv bootmenu_delay 1; -setenv bootdelay 1; -EOF -./mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n bootmenu_nand -d bootmenu_nand bootmenu_nand.scr - -# Generate bootmenu for UBI booting (zImage) -cat > bootmenu_ubi << EOF -setenv bootmenu_0 'zImage-2.6.28-omap1 from UBI=setenv bootargs; setenv setup_omap_atag 1; ubi part rootfs && ubi read \${kernaddr} kernel && bootz \${kernaddr}'; -setenv bootmenu_1; -setenv bootmenu_delay 1; -setenv bootdelay 1; -EOF -./mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n bootmenu_ubi -d bootmenu_ubi bootmenu_ubi.scr - -# Generate bootmenu for default booting -cat > bootmenu_default << EOF -setenv bootmenu_delay 1; -setenv bootdelay 1; -EOF -./mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n bootmenu_default -d bootmenu_default bootmenu_default.scr - -# Generate combined image from u-boot and Maemo fiasco kernel -./u-boot-gen-combined u-boot.bin zImage-2.6.28-omap1 combined_zimage.bin -./u-boot-gen-combined u-boot.bin uImage-2.6.28-omap1 combined_uimage.bin - -# Generate combined hack image from u-boot and Maemo fiasco kernel (kernel starts at 2MB offset and qflasher puts 2kB header before supplied image) -cp u-boot.bin combined_hack.bin -dd if=uImage-2.6.28-omap1 of=combined_hack.bin bs=1024 seek=$((2048-2)) - -# Generate FAT32 eMMC image for U-Boot serial console testing -truncate -s 50MiB emmc_uboot.img -mformat -m 0xf8 -F -h 4 -s 16 -c 1 -t $((50*1024*1024/(4*16*512))) :: -i emmc_uboot.img -mcopy bootmenu_uboot.scr ::/bootmenu.scr -i emmc_uboot.img - -# Generate FAT32 eMMC image for eMMC booting (uImage) -truncate -s 50MiB emmc_emmc.img -mformat -m 0xf8 -F -h 4 -s 16 -c 1 -t $((50*1024*1024/(4*16*512))) :: -i emmc_emmc.img -mcopy uImage-2.6.28-omap1 ::/uImage-2.6.28-omap1 -i emmc_emmc.img -mcopy bootmenu_emmc.scr ::/bootmenu.scr -i emmc_emmc.img - -# Generate FAT32 eMMC image for eMMC booting (zImage) -truncate -s 50MiB emmc_emmc2.img -mformat -m 0xf8 -F -h 4 -s 16 -c 1 -t $((50*1024*1024/(4*16*512))) :: -i emmc_emmc2.img -mcopy zImage-2.6.28-omap1 ::/zImage-2.6.28-omap1 -i emmc_emmc2.img -mcopy bootmenu_emmc2.scr ::/bootmenu.scr -i emmc_emmc2.img - -# Generate FAT32 eMMC image for OneNAND booting (uImage) -truncate -s 50MiB emmc_nand.img -mformat -m 0xf8 -F -h 4 -s 16 -c 1 -t $((50*1024*1024/(4*16*512))) :: -i emmc_nand.img -mcopy bootmenu_nand.scr ::/bootmenu.scr -i emmc_nand.img - -# Generate FAT32 eMMC image for UBI booting (zImage) -truncate -s 50MiB emmc_ubi.img -mformat -m 0xf8 -F -h 4 -s 16 -c 1 -t $((50*1024*1024/(4*16*512))) :: -i emmc_ubi.img -mcopy bootmenu_ubi.scr ::/bootmenu.scr -i emmc_ubi.img - -# Generate FAT32 eMMC image for default booting -truncate -s 50MiB emmc_default.img -mformat -m 0xf8 -F -h 4 -s 16 -c 1 -t $((50*1024*1024/(4*16*512))) :: -i emmc_default.img -mcopy bootmenu_default.scr ::/bootmenu.scr -i emmc_default.img - -# Generate MTD image for U-Boot serial console testing -rm -f mtd_uboot.img -./qflasher -v -x xloader-qemu.bin -s secondary-qemu.bin -k u-boot.bin -m rx51 -o mtd_uboot.img - -# Generate MTD image for RAM booting from bootloader nolo images, compiled image and rootfs image -rm -f mtd_ram.img -./qflasher -v -x xloader-qemu.bin -s secondary-qemu.bin -k combined_uimage.bin -r ubi.img -m rx51 -o mtd_ram.img -rm -f mtd_ram2.img -./qflasher -v -x xloader-qemu.bin -s secondary-qemu.bin -k combined_zimage.bin -r ubi.img -m rx51 -o mtd_ram2.img - -# Generate MTD image for eMMC booting from bootloader nolo images, u-boot image and rootfs image -rm -f mtd_emmc.img -./qflasher -v -x xloader-qemu.bin -s secondary-qemu.bin -k u-boot.bin -r ubi.img -m rx51 -o mtd_emmc.img - -# Generate MTD image for OneNAND booting from bootloader nolo images, combined hacked image and rootfs image -# Kernel image is put into initfs area, but qflasher reject to copy kernel image into initfs area because it does not have initfs signature -# This is hack to workaround this problem, tell qflasher that kernel area for u-boot is bigger and put big combined hacked image (u-boot + kernel with correct offset) -rm -f mtd_nand.img -./qflasher -v -x xloader-qemu.bin -s secondary-qemu.bin -k combined_hack.bin -r ubi.img -m rx51 -p k=4094,i=2 -o mtd_nand.img - -# Generate MTD image for UBI booting from bootloader nolo images, u-boot image with UBI/UBIFS support and rootfs image with kernel volume -rm -f mtd_ubi.img -./qflasher -v -x xloader-qemu.bin -s secondary-qemu.bin -k u-boot-ubifs.bin -r ubi_with_kernel.img -m rx51 -o mtd_ubi.img - -echo -echo "======================================================" -echo "========== Running test images in n900 qemu ==========" -echo "======================================================" -echo - -# Run MTD image in qemu and wait for 300s if U-Boot prints testing string to serial console and poweroff -rm -f qemu_uboot.log -./qemu-system-arm -M n900 -mtdblock mtd_uboot.img -sd emmc_uboot.img -serial /dev/stdout -display none > qemu_uboot.log & -qemu_pid=$! -tail -F qemu_uboot.log & -tail_pid=$! -sleep 300 & -sleep_pid=$! -wait -n $sleep_pid $qemu_pid || true -kill -9 $tail_pid $sleep_pid $qemu_pid 2>/dev/null || true -wait || true - -# Run MTD image in qemu and wait for 300s if uImage kernel from RAM is correctly booted -rm -f qemu_ram.log -./qemu-system-arm -M n900 -mtdblock mtd_ram.img -serial /dev/stdout -display none > qemu_ram.log & -qemu_pid=$! -tail -F qemu_ram.log & -tail_pid=$! -sleep 300 & -sleep_pid=$! -wait -n $sleep_pid $qemu_pid || true -kill -9 $tail_pid $sleep_pid $qemu_pid 2>/dev/null || true -wait || true - -# Run MTD image in qemu and wait for 300s if zImage kernel from RAM is correctly booted -rm -f qemu_ram2.log -./qemu-system-arm -M n900 -mtdblock mtd_ram2.img -sd emmc_default.img -serial /dev/stdout -display none > qemu_ram2.log & -qemu_pid=$! -tail -F qemu_ram2.log & -tail_pid=$! -sleep 300 & -sleep_pid=$! -wait -n $sleep_pid $qemu_pid || true -kill -9 $tail_pid $sleep_pid $qemu_pid 2>/dev/null || true -wait || true - -# Run MTD image in qemu and wait for 300s if uImage kernel from eMMC is correctly booted -rm -f qemu_emmc.log -./qemu-system-arm -M n900 -mtdblock mtd_emmc.img -sd emmc_emmc.img -serial /dev/stdout -display none > qemu_emmc.log & -qemu_pid=$! -tail -F qemu_emmc.log & -tail_pid=$! -sleep 300 & -sleep_pid=$! -wait -n $sleep_pid $qemu_pid || true -kill -9 $tail_pid $sleep_pid $qemu_pid 2>/dev/null || true -wait || true - -# Run MTD image in qemu and wait for 300s if zImage kernel from eMMC is correctly booted -rm -f qemu_emmc2.log -./qemu-system-arm -M n900 -mtdblock mtd_emmc.img -sd emmc_emmc2.img -serial /dev/stdout -display none > qemu_emmc2.log & -qemu_pid=$! -tail -F qemu_emmc2.log & -tail_pid=$! -sleep 300 & -sleep_pid=$! -wait -n $sleep_pid $qemu_pid || true -kill -9 $tail_pid $sleep_pid $qemu_pid 2>/dev/null || true -wait || true - -# Run MTD image in qemu and wait for 300s if kernel from OneNAND is correctly booted -rm -f qemu_nand.log -./qemu-system-arm -M n900 -mtdblock mtd_nand.img -sd emmc_nand.img -serial /dev/stdout -display none > qemu_nand.log & -qemu_pid=$! -tail -F qemu_nand.log & -tail_pid=$! -sleep 300 & -sleep_pid=$! -wait -n $sleep_pid $qemu_pid || true -kill -9 $tail_pid $sleep_pid $qemu_pid 2>/dev/null || true -wait || true - -# Run MTD image in qemu and wait for 300s if kernel from UBI is correctly booted -rm -f qemu_ubi.log -./qemu-system-arm -M n900 -mtdblock mtd_ubi.img -sd emmc_ubi.img -serial /dev/stdout -display none > qemu_ubi.log & -qemu_pid=$! -tail -F qemu_ubi.log & -tail_pid=$! -sleep 300 & -sleep_pid=$! -wait -n $sleep_pid $qemu_pid || true -kill -9 $tail_pid $sleep_pid $qemu_pid 2>/dev/null || true -wait || true - -echo -echo "=============================" -echo "========== Results ==========" -echo "=============================" -echo - -if grep -q 'Successfully booted' qemu_uboot.log; then echo "U-Boot serial console is working"; else echo "U-Boot serial console test failed"; fi -if grep -q 'Successfully booted' qemu_ram.log; then echo "Kernel (uImage) was successfully booted from RAM"; else echo "Failed to boot kernel (uImage) from RAM"; fi -if grep -q 'Successfully booted' qemu_ram2.log; then echo "Kernel (zImage) was successfully booted from RAM"; else echo "Failed to boot kernel (zImage) from RAM"; fi -if grep -q 'Successfully booted' qemu_emmc.log; then echo "Kernel (uImage) was successfully booted from eMMC"; else echo "Failed to boot kernel (uImage) from eMMC"; fi -if grep -q 'Successfully booted' qemu_emmc2.log; then echo "Kernel (zImage) was successfully booted from eMMC"; else echo "Failed to boot kernel (zImage) from eMMC"; fi -if grep -q 'Successfully booted' qemu_nand.log; then echo "Kernel (uImage) was successfully booted from OneNAND"; else echo "Failed to boot kernel (uImage) from OneNAND"; fi -if grep -q 'Successfully booted' qemu_ubi.log; then echo "Kernel (zImage) was successfully booted from UBI"; else echo "Failed to boot kernel (zImage) from UBI"; fi - -echo - -if grep -q 'Successfully booted' qemu_uboot.log && grep -q 'Successfully booted' qemu_ram.log && grep -q 'Successfully booted' qemu_ram2.log && grep -q 'Successfully booted' qemu_emmc.log && grep -q 'Successfully booted' qemu_emmc2.log && grep -q 'Successfully booted' qemu_nand.log && grep -q 'Successfully booted' qemu_ubi.log; then - echo "All tests passed" - exit 0 -else - echo "Some tests failed" - exit 1 -fi diff --git a/tools/binman/binman.rst b/tools/binman/binman.rst index aeea33f..020988d 100644 --- a/tools/binman/binman.rst +++ b/tools/binman/binman.rst @@ -1480,9 +1480,6 @@ as set in stone, so Binman will ensure it doesn't change. Without this feature, repacking an entry might cause it to disobey the original constraints provided when it was created. - Repacking an image involves - -.. _`BinmanLogging`: Signing FIT container with private key in an image -------------------------------------------------- @@ -1501,6 +1498,7 @@ If you want to sign and replace FIT container in place:: which will sign FIT container with private key and replace it immediately inside your image. +.. _`BinmanLogging`: Logging ------- diff --git a/tools/binman/etype/section.py b/tools/binman/etype/section.py index fb49e85..30c1041 100644 --- a/tools/binman/etype/section.py +++ b/tools/binman/etype/section.py @@ -40,7 +40,7 @@ class Entry_section(Entry): For example code, see etypes which subclass `Entry_section`, or `cbfs.py` for a more involved example:: - $ grep -l \(Entry_section tools/binman/etype/*.py + $ grep -l \\(Entry_section tools/binman/etype/*.py ReadNode() Call `super().ReadNode()`, then read any special properties for the diff --git a/tools/buildman/main.py b/tools/buildman/main.py index 5f42a58..3cf877e 100755 --- a/tools/buildman/main.py +++ b/tools/buildman/main.py @@ -7,7 +7,7 @@ """See README for more information""" try: - from importlib.resources import files + import importlib.resources except ImportError: # for Python 3.6 import importlib_resources @@ -83,7 +83,13 @@ def run_buildman(): run_test_coverage() elif args.full_help: - tools.print_full_help(str(files('buildman').joinpath('README.rst'))) + if hasattr(importlib.resources, 'files'): + dirpath = importlib.resources.files('buildman') + tools.print_full_help(str(dirpath.joinpath('README.rst'))) + else: + with importlib.resources.path('buildman', 'README.rst') as readme: + tools.print_full_help(str(readme)) + # Build selected commits for selected boards else: diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 1acb541..c4a2596 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -186,27 +186,6 @@ RUN git clone https://gitlab.com/qemu-project/qemu.git /tmp/qemu && \ make -j$(nproc) all install && \ rm -rf /tmp/qemu -# Build QEMU supporting Nokia n900 emulation -RUN mkdir -p /opt/nokia && \ - cd /tmp && \ - git clone https://git.linaro.org/qemu/qemu-linaro.git && \ - cd /tmp/qemu-linaro && \ - git checkout 8f8d8e0796efe1a6f34cdd83fb798f3c41217ec1 && \ - ./configure --enable-system --target-list=arm-softmmu \ - --python=/usr/bin/python2.7 --disable-sdl --disable-gtk \ - --disable-curses --audio-drv-list= --audio-card-list= \ - --disable-werror --disable-xen --disable-xen-pci-passthrough \ - --disable-brlapi --disable-vnc --disable-curl --disable-slirp \ - --disable-kvm --disable-user --disable-linux-user --disable-bsd-user \ - --disable-guest-base --disable-uuid --disable-vde --disable-linux-aio \ - --disable-cap-ng --disable-attr --disable-blobs --disable-docs \ - --disable-spice --disable-libiscsi --disable-smartcard-nss \ - --disable-usb-redir --disable-guest-agent --disable-seccomp \ - --disable-glusterfs --disable-nptl --disable-fdt && \ - make -j$(nproc) && \ - cp /tmp/qemu-linaro/arm-softmmu/qemu-system-arm /opt/nokia && \ - rm -rf /tmp/qemu-linaro - # Build genimage (required by some targets to generate disk images) RUN wget -O - https://github.com/pengutronix/genimage/releases/download/v14/genimage-14.tar.xz | tar -C /tmp -xJ && \ cd /tmp/genimage-14 && \ @@ -250,16 +229,6 @@ RUN mkdir /tmp/trace && \ sudo make install && \ rm -rf /tmp/trace -# Files to run Nokia RX-51 (aka N900) tests -RUN mkdir -p /opt/nokia && \ - cd /opt/nokia && \ - wget https://raw.githubusercontent.com/pali/u-boot-maemo/master/debian/u-boot-gen-combined && \ - chmod 0755 u-boot-gen-combined && \ - wget http://repository.maemo.org/qemu-n900/qemu-n900.tar.gz && \ - wget http://repository.maemo.org/pool/maemo5.0/free/k/kernel/kernel_2.6.28-20103103+0m5_armel.deb && \ - wget http://repository.maemo.org/pool/maemo5.0/free/g/glibc/libc6_2.5.1-1eglibc27+0m5_armel.deb && \ - wget http://repository.maemo.org/pool/maemo5.0/free/b/busybox/busybox_1.10.2.legal-1osso30+0m5_armel.deb - # Create our user/group RUN echo uboot ALL=NOPASSWD: ALL > /etc/sudoers.d/uboot RUN useradd -m -U uboot diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py index 6700057..b0a12f2 100644 --- a/tools/patman/gitutil.py +++ b/tools/patman/gitutil.py @@ -651,7 +651,7 @@ def get_default_user_name(): Returns: User name found in .gitconfig file, or None if none """ - uname = command.output_one_line('git', 'config', '--global', 'user.name') + uname = command.output_one_line('git', 'config', '--global', '--includes', 'user.name') return uname @@ -661,7 +661,7 @@ def get_default_user_email(): Returns: User's email found in .gitconfig file, or None if none """ - uemail = command.output_one_line('git', 'config', '--global', 'user.email') + uemail = command.output_one_line('git', 'config', '--global', '--includes', 'user.email') return uemail diff --git a/tools/patman/pyproject.toml b/tools/patman/pyproject.toml index c5dc7c7..a54211f 100644 --- a/tools/patman/pyproject.toml +++ b/tools/patman/pyproject.toml @@ -23,7 +23,7 @@ classifiers = [ "Bug Tracker" = "https://source.denx.de/groups/u-boot/-/issues" [project.scripts] -patman = "patman.__main__:run_patman" +patman = "patman.__main__" [tool.setuptools.package-data] patman = ["*.rst"] |