| Message ID | 1485644718-20435-6-git-send-email-dwesterg@gmail.com |
|---|---|
| State | Deferred |
| Delegated to: | Tom Rini |
| Headers | show |
On 01/29/2017 12:05 AM, Dalon Westergreen wrote: > From: Dalon Westergreen <dalon.westergreen@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@intel.com> > Acked-by: Marek Vasut <marex@denx.de> > Acked-by: Dinh Nguyen <dinguyen@kernel.org> > --- > configs/socfpga_de1_soc_defconfig | 1 + > include/configs/socfpga_de1_soc.h | 19 +------------------ > 2 files changed, 2 insertions(+), 18 deletions(-) > > diff --git a/configs/socfpga_de1_soc_defconfig b/configs/socfpga_de1_soc_defconfig > index 032deef..d78e8a1 100644 > --- a/configs/socfpga_de1_soc_defconfig > +++ b/configs/socfpga_de1_soc_defconfig > @@ -6,6 +6,7 @@ CONFIG_TARGET_SOCFPGA_TERASIC_DE1_SOC=y > CONFIG_SPL_STACK_R_ADDR=0x00800000 > CONFIG_SPL_YMODEM_SUPPORT=y > CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de1_soc" > +CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_de1_soc.dtb" > CONFIG_FIT=y > CONFIG_SYS_CONSOLE_IS_IN_ENV=y > CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y > diff --git a/include/configs/socfpga_de1_soc.h b/include/configs/socfpga_de1_soc.h > index deec647..3142bd1 100644 > --- a/include/configs/socfpga_de1_soc.h > +++ b/include/configs/socfpga_de1_soc.h > @@ -18,7 +18,7 @@ > #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB */ > > /* Booting Linux */ > -#define CONFIG_BOOTFILE "fitImage" > +#define CONFIG_BOOTFILE "zImage" ok, here you're confusing me. I thought the point of having the crude, hacky mmcload/mmcboot in bootcmd was because you want to be legacy compatible. If you're changing the bootfile name, that point is moot. So at this point, why not just switch to distro boot and extlinux.conf / efi altogether? Alex
On Mon, 2017-01-30 at 16:07 +0100, Alexander Graf wrote: > On 01/29/2017 12:05 AM, Dalon Westergreen wrote: > > > > From: Dalon Westergreen <dalon.westergreen@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@intel.com> > > Acked-by: Marek Vasut <marex@denx.de> > > Acked-by: Dinh Nguyen <dinguyen@kernel.org> > > --- > > configs/socfpga_de1_soc_defconfig | 1 + > > include/configs/socfpga_de1_soc.h | 19 +------------------ > > 2 files changed, 2 insertions(+), 18 deletions(-) > > > > diff --git a/configs/socfpga_de1_soc_defconfig > > b/configs/socfpga_de1_soc_defconfig > > index 032deef..d78e8a1 100644 > > --- a/configs/socfpga_de1_soc_defconfig > > +++ b/configs/socfpga_de1_soc_defconfig > > @@ -6,6 +6,7 @@ CONFIG_TARGET_SOCFPGA_TERASIC_DE1_SOC=y > > CONFIG_SPL_STACK_R_ADDR=0x00800000 > > CONFIG_SPL_YMODEM_SUPPORT=y > > CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de1_soc" > > +CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_de1_soc.dtb" > > CONFIG_FIT=y > > CONFIG_SYS_CONSOLE_IS_IN_ENV=y > > CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y > > diff --git a/include/configs/socfpga_de1_soc.h > > b/include/configs/socfpga_de1_soc.h > > index deec647..3142bd1 100644 > > --- a/include/configs/socfpga_de1_soc.h > > +++ b/include/configs/socfpga_de1_soc.h > > @@ -18,7 +18,7 @@ > > #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB */ > > > > /* Booting Linux */ > > -#define CONFIG_BOOTFILE "fitImage" > > +#define CONFIG_BOOTFILE "zImage" > > ok, here you're confusing me. I thought the point of having the crude, > hacky mmcload/mmcboot in bootcmd was because you want to be legacy > compatible. If you're changing the bootfile name, that point is moot. > > So at this point, why not just switch to distro boot and extlinux.conf / > efi altogether? > Bootfile was never used in the environment, neither have any of the kits by default been using fitimages. When the environment was moved to a common one i setting the bootfile def to match what was actually used. moving to distro boot is in the works and i will look at SCAN_DEV_FOR_EFI for legacy support. thanks, dalon > > Alex >
diff --git a/configs/socfpga_de1_soc_defconfig b/configs/socfpga_de1_soc_defconfig index 032deef..d78e8a1 100644 --- a/configs/socfpga_de1_soc_defconfig +++ b/configs/socfpga_de1_soc_defconfig @@ -6,6 +6,7 @@ CONFIG_TARGET_SOCFPGA_TERASIC_DE1_SOC=y CONFIG_SPL_STACK_R_ADDR=0x00800000 CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de1_soc" +CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_de1_soc.dtb" CONFIG_FIT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y diff --git a/include/configs/socfpga_de1_soc.h b/include/configs/socfpga_de1_soc.h index deec647..3142bd1 100644 --- a/include/configs/socfpga_de1_soc.h +++ b/include/configs/socfpga_de1_soc.h @@ -18,7 +18,7 @@ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB */ /* Booting Linux */ -#define CONFIG_BOOTFILE "fitImage" +#define CONFIG_BOOTFILE "zImage" #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} - ${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>