diff options
| author | Tom Rini <trini@konsulko.com> | 2017-04-14 09:05:57 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-04-14 09:05:57 -0400 |
| commit | c1a16c3ab541c014b029b42cc27cae496107e170 (patch) | |
| tree | e5da12851a4d920d9b79fa8547db9f479e506fed /include/configs/socfpga_de1_soc.h | |
| parent | af1b7286d8b2712cff5779d8a1565afed9d9d8e6 (diff) | |
| parent | 09397d99edb402c04d1e20b32989b5b2ecbb037a (diff) | |
| download | u-boot-c1a16c3ab541c014b029b42cc27cae496107e170.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
Diffstat (limited to 'include/configs/socfpga_de1_soc.h')
| -rw-r--r-- | include/configs/socfpga_de1_soc.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/include/configs/socfpga_de1_soc.h b/include/configs/socfpga_de1_soc.h index c6e8d81be6..014828bc08 100644 --- a/include/configs/socfpga_de1_soc.h +++ b/include/configs/socfpga_de1_soc.h @@ -16,9 +16,6 @@ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB */ /* Booting Linux */ -#define CONFIG_BOOTFILE "fitImage" -#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 @@ -30,23 +27,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} - ${fdtaddr}\0" \ - "bootimage=zImage\0" \ - "fdtaddr=100\0" \ - "fdtimage=socfpga.dtb\0" \ - "bootm ${loadaddr} - ${fdtaddr}\0" \ - "mmcroot=/dev/mmcblk0p2\0" \ - "mmcboot=setenv bootargs " CONFIG_BOOTARGS \ - " root=${mmcroot} rw rootwait;" \ - "bootz ${loadaddr} - ${fdtaddr}\0" \ - "mmcload=mmc rescan;" \ - "load mmc 0:1 ${loadaddr} ${bootimage};" \ - "load mmc 0:1 ${fdtaddr} ${fdtimage}\0" \ - /* The rest of the configuration is shared */ #include <configs/socfpga_common.h> |