[U-Boot] [PATCH v4 8/8] arm: socfpga: sr1500 use environment in common header

Stefan Roese
2017-02-20T06:29:59Z

On 19.02.2017 21:21, Dalon Westergreen wrote:
> This removes the default environment from the sr1500 header
> and instead uses the common environment provided in
> socfpga_common.h which now uses distro boot.
>
> This board has no upstream devicetree in the kernel source,
> so set to socfpga_cyclone5_sr1500.dtb.
>
> Signed-off-by: Dalon Westergreen <dwesterg@gmail.com>
> Acked-by: Marek Vasut <marex@denx.de>
>
> --
> Changes in v2:
> - Remove unneeded CONFIG_BOOTFILE
> - set devicetree name to match socfpga_{fpga model}_{board model}.dts
> pattern
> ---
> configs/socfpga_sr1500_defconfig | 1 +
> include/configs/socfpga_sr1500.h | 28 ----------------------------
> 2 files changed, 1 insertion(+), 28 deletions(-)
>
> diff --git a/configs/socfpga_sr1500_defconfig b/configs/socfpga_sr1500_defconfig
> index 981600b..ac1ed53 100644
> --- a/configs/socfpga_sr1500_defconfig
> +++ b/configs/socfpga_sr1500_defconfig
> @@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
> CONFIG_TARGET_SOCFPGA_SR1500=y
> CONFIG_SPL_STACK_R_ADDR=0x00800000
> CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sr1500"
> +CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_sr1500.dtb"
> CONFIG_FIT=y
> CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h
> index f67fafd..64e1595 100644
> --- a/include/configs/socfpga_sr1500.h
> +++ b/include/configs/socfpga_sr1500.h
> @@ -16,9 +16,6 @@
> #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on SR1500 */
>
> /* Booting Linux */
> -#define CONFIG_BOOTFILE "uImage"
> -#define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE)
> -#define CONFIG_BOOTCOMMAND "run mmcload; run mmcboot"
> #define CONFIG_LOADADDR 0x01000000
> #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
>
> @@ -28,31 +25,6 @@
> #define CONFIG_PHY_MARVELL
> #define PHY_ANEG_TIMEOUT 8000
>
> -#define CONFIG_EXTRA_ENV_SETTINGS \
> - "verify=n\0" \
> - "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
> - "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \
> - "bootm ${loadaddr} - ${fdt_addr}\0" \
> - "bootimage=zImage\0" \
> - "fdt_addr=100\0" \
> - "fdtimage=socfpga.dtb\0" \
> - "fsloadcmd=ext2load\0" \
> - "bootm ${loadaddr} - ${fdt_addr}\0" \
> - "mmcroot=/dev/mmcblk0p2\0" \
> - "mmcboot=setenv bootargs " CONFIG_BOOTARGS \
> - " root=${mmcroot} rw rootwait;" \
> - "bootz ${loadaddr} - ${fdt_addr}\0" \
> - "mmcload=mmc rescan;" \
> - "load mmc 0:1 ${loadaddr} ${bootimage};" \
> - "load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \
> - "qspiload=sf probe && mtdparts default && run ubiload\0" \
> - "qspiboot=setenv bootargs " CONFIG_BOOTARGS \
> - " ubi.mtd=1,64 root=ubi0:rootfs rw rootfstype=ubifs;"\
> - "bootz ${loadaddr} - ${fdt_addr}\0" \
> - "ubiload=ubi part UBI && ubifsmount ubi0 && " \
> - "ubifsload ${loadaddr} /boot/${bootimage} && " \
> - "ubifsload ${fdt_addr} /boot/${fdtimage}\0"
> -
> /* Environment */
> #define CONFIG_ENV_IS_IN_SPI_FLASH

Acked-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan