[U-Boot] [PATCH v3 2/7] arm: socfpga: update de0 nano default environment

[Marek Vasut]

On 01/23/2017 04:51 AM, Dalon Westergreen wrote:
> From: Dalon Westergreen <dalon.westergreen at intel.com>
> 
> Remove the default environment as it is now in a common
> header.
> 
> Add the CONFIG_DEFAULT_DEVICE_TREE to the board's defconfig
> to set the linux devicetree name.
> 
> Signed-off-by: Dalon Westergreen <dalon.westergreen at intel.com>
> ---
>  configs/socfpga_de0_nano_soc_defconfig |  3 +--
>  include/configs/socfpga_de0_nano_soc.h | 19 +------------------
>  2 files changed, 2 insertions(+), 20 deletions(-)
> 
> diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig
> index af41e1e..4837809 100644
> --- a/configs/socfpga_de0_nano_soc_defconfig
> +++ b/configs/socfpga_de0_nano_soc_defconfig
> @@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
>  CONFIG_TARGET_SOCFPGA_TERASIC_DE0_NANO=y
>  CONFIG_SPL_STACK_R_ADDR=0x00800000
>  CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_nano_soc"
> +CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_de0_sockit.dtb"
>  CONFIG_FIT=y
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> @@ -20,7 +21,6 @@ CONFIG_CMD_ASKENV=y
>  CONFIG_CMD_GREPENV=y
>  # CONFIG_CMD_FLASH is not set
>  CONFIG_CMD_MMC=y
> -CONFIG_CMD_SF=y
>  CONFIG_CMD_SPI=y
>  CONFIG_CMD_I2C=y
>  CONFIG_CMD_USB=y
> @@ -35,7 +35,6 @@ CONFIG_CMD_EXT4=y
>  CONFIG_CMD_EXT4_WRITE=y
>  CONFIG_CMD_FAT=y
>  CONFIG_CMD_FS_GENERIC=y
> -CONFIG_CMD_UBI=y
>  CONFIG_SPL_DM=y
>  CONFIG_DFU_MMC=y
>  CONFIG_DM_GPIO=y
> diff --git a/include/configs/socfpga_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h
> index 6b9546e..97216ea 100644
> --- a/include/configs/socfpga_de0_nano_soc.h
> +++ b/include/configs/socfpga_de0_nano_soc.h
> @@ -18,7 +18,7 @@
>  #define PHYS_SDRAM_1_SIZE		0x40000000	/* 1GiB */
>  
>  /* Booting Linux */
> -#define CONFIG_BOOTFILE		"fitImage"
> +#define CONFIG_BOOTFILE		"zImage"

fitImage is in fact superior to zImage , so I don't like this change
very much. Is this because of compatibility with the shipping image
which uses the inferior raw zImage + DT ?

>  #define CONFIG_BOOTARGS		"console=ttyS0," __stringify(CONFIG_BAUDRATE)
>  #define CONFIG_BOOTCOMMAND	"run mmcload; run mmcboot"
>  #define CONFIG_LOADADDR		0x01000000
> @@ -32,23 +32,6 @@
>  
>  #define CONFIG_ENV_IS_IN_MMC
>  
> -/* Extra Environment */
> -#define CONFIG_EXTRA_ENV_SETTINGS \
> -	"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" \
> -	"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" \
> -
>  /* The rest of the configuration is shared */
>  #include <configs/socfpga_common.h>
>  
> 


-- 
Best regards,
Marek Vasut