diff mbox

[U-Boot,v4,1/7] arm: socfpga: add env settings to common header

Message ID 1485277563-18514-2-git-send-email-dwesterg@gmail.com
State Superseded
Delegated to: Marek Vasut
Headers show

Commit Message

Dalon Westergreen Jan. 24, 2017, 5:05 p.m. UTC 
From: Dalon Westergreen <dalon.westergreen@intel.com>

Move repeated environment settings for socfpga boards
to a common header.

The default values for the boot partition and the
OS filesystem partition have changed and as
as result the default uboot environment for socfpga
boards needs updating.

Move to using  CONFIG_DEFAULT_DEVICE_TREE for setting the
default linux devicetree used during linux boot.

Signed-off-by: Dalon Westergreen <dalon.westergreen@intel.com>
---
 include/configs/socfpga_common.h | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

Comments

Dinh Nguyen Jan. 25, 2017, 3:31 a.m. UTC | #1 
On 01/24/2017 11:05 AM, Dalon Westergreen wrote:
> From: Dalon Westergreen <dalon.westergreen@intel.com>
> 
> Move repeated environment settings for socfpga boards
> to a common header.
> 
> The default values for the boot partition and the
> OS filesystem partition have changed and as
> as result the default uboot environment for socfpga
> boards needs updating.
> 
> Move to using  CONFIG_DEFAULT_DEVICE_TREE for setting the
> default linux devicetree used during linux boot.
> 
> Signed-off-by: Dalon Westergreen <dalon.westergreen@intel.com>
> ---
>  include/configs/socfpga_common.h | 27 +++++++++++++++++++++++++++
>  1 file changed, 27 insertions(+)
> 
> diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
> index 6285266..bdd6e2f 100644
> --- a/include/configs/socfpga_common.h
> +++ b/include/configs/socfpga_common.h
> @@ -336,5 +336,32 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
>   * Stack setup
>   */
>  #define CONFIG_SPL_STACK		CONFIG_SYS_INIT_SP_ADDR
> +	
> +/* Extra Environment */
> +#ifndef CONFIG_EXTRA_ENV_SETTINGS
> +#define CONFIG_EXTRA_ENV_SETTINGS \
> +	"verify=n\0" \
> +	"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
> +	"bootimage=" CONFIG_BOOTFILE "\0" \
> +	"fdt_addr=100\0" \
> +	"fdtimage=" CONFIG_DEFAULT_FDT_FILE "\0" \
> +	"ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \
> +		"bootm ${loadaddr} - ${fdt_addr}\0" \
> +	"mmcroot=/dev/mmcblk0p3\0" \

Should this be mmcblk0p2?

Dinh
Westergreen, Dalon Jan. 25, 2017, 3:35 a.m. UTC | #2 
On Tue, 2017-01-24 at 21:31 -0600, Dinh Nguyen wrote:
> 

> On 01/24/2017 11:05 AM, Dalon Westergreen wrote:

> > 

> > From: Dalon Westergreen <dalon.westergreen@intel.com>

> > 

> > Move repeated environment settings for socfpga boards

> > to a common header.

> > 

> > The default values for the boot partition and the

> > OS filesystem partition have changed and as

> > as result the default uboot environment for socfpga

> > boards needs updating.

> > 

> > Move to using  CONFIG_DEFAULT_DEVICE_TREE for setting the

> > default linux devicetree used during linux boot.

> > 

> > Signed-off-by: Dalon Westergreen <dalon.westergreen@intel.com>

> > ---

> >  include/configs/socfpga_common.h | 27 +++++++++++++++++++++++++++

> >  1 file changed, 27 insertions(+)

> > 

> > diff --git a/include/configs/socfpga_common.h

> > b/include/configs/socfpga_common.h

> > index 6285266..bdd6e2f 100644

> > --- a/include/configs/socfpga_common.h

> > +++ b/include/configs/socfpga_common.h

> > @@ -336,5 +336,32 @@ unsigned int cm_get_qspi_controller_clk_hz(void);

> >   * Stack setup

> >   */

> >  #define CONFIG_SPL_STACK		CONFIG_SYS_INIT_SP_ADDR

> > +	

> > +/* Extra Environment */

> > +#ifndef CONFIG_EXTRA_ENV_SETTINGS

> > +#define CONFIG_EXTRA_ENV_SETTINGS \

> > +	"verify=n\0" \

> > +	"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \

> > +	"bootimage=" CONFIG_BOOTFILE "\0" \

> > +	"fdt_addr=100\0" \

> > +	"fdtimage=" CONFIG_DEFAULT_FDT_FILE "\0" \

> > +	"ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \

> > +		"bootm ${loadaddr} - ${fdt_addr}\0" \

> > +	"mmcroot=/dev/mmcblk0p3\0" \

> 

> Should this be mmcblk0p2?

that was the point of the patches, p1 is now the
a2 partition, so the fat and root partition 
shifted up by 1.

> 

> Dinh

-- 
------------------------------------------
Dalon Westergreen
Embedded Specialist
Intel Programmable Solutions Group
Phone : 1.858.202.3518
------------------------------------------
Dinh Nguyen Jan. 25, 2017, 3:37 a.m. UTC | #3 
On 01/24/2017 09:35 PM, Westergreen, Dalon wrote:
> On Tue, 2017-01-24 at 21:31 -0600, Dinh Nguyen wrote:
>>
>> On 01/24/2017 11:05 AM, Dalon Westergreen wrote:
>>>
>>> From: Dalon Westergreen <dalon.westergreen@intel.com>
>>>
>>> Move repeated environment settings for socfpga boards
>>> to a common header.
>>>
>>> The default values for the boot partition and the
>>> OS filesystem partition have changed and as
>>> as result the default uboot environment for socfpga
>>> boards needs updating.
>>>
>>> Move to using  CONFIG_DEFAULT_DEVICE_TREE for setting the
>>> default linux devicetree used during linux boot.
>>>
>>> Signed-off-by: Dalon Westergreen <dalon.westergreen@intel.com>
>>> ---
>>>  include/configs/socfpga_common.h | 27 +++++++++++++++++++++++++++
>>>  1 file changed, 27 insertions(+)
>>>
>>> diff --git a/include/configs/socfpga_common.h
>>> b/include/configs/socfpga_common.h
>>> index 6285266..bdd6e2f 100644
>>> --- a/include/configs/socfpga_common.h
>>> +++ b/include/configs/socfpga_common.h
>>> @@ -336,5 +336,32 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
>>>   * Stack setup
>>>   */
>>>  #define CONFIG_SPL_STACK		CONFIG_SYS_INIT_SP_ADDR
>>> +	
>>> +/* Extra Environment */
>>> +#ifndef CONFIG_EXTRA_ENV_SETTINGS
>>> +#define CONFIG_EXTRA_ENV_SETTINGS \
>>> +	"verify=n\0" \
>>> +	"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
>>> +	"bootimage=" CONFIG_BOOTFILE "\0" \
>>> +	"fdt_addr=100\0" \
>>> +	"fdtimage=" CONFIG_DEFAULT_FDT_FILE "\0" \
>>> +	"ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \
>>> +		"bootm ${loadaddr} - ${fdt_addr}\0" \
>>> +	"mmcroot=/dev/mmcblk0p3\0" \
>>
>> Should this be mmcblk0p2?
> that was the point of the patches, p1 is now the
> a2 partition, so the fat and root partition 
> shifted up by 1.
> 

Ok, sorry about that.

Dinh
diff mbox

Patch

diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 6285266..bdd6e2f 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -336,5 +336,32 @@  unsigned int cm_get_qspi_controller_clk_hz(void);
  * Stack setup
  */
 #define CONFIG_SPL_STACK		CONFIG_SYS_INIT_SP_ADDR
+	
+/* Extra Environment */
+#ifndef CONFIG_EXTRA_ENV_SETTINGS
+#define CONFIG_EXTRA_ENV_SETTINGS \
+	"verify=n\0" \
+	"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
+	"bootimage=" CONFIG_BOOTFILE "\0" \
+	"fdt_addr=100\0" \
+	"fdtimage=" CONFIG_DEFAULT_FDT_FILE "\0" \
+	"ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \
+		"bootm ${loadaddr} - ${fdt_addr}\0" \
+	"mmcroot=/dev/mmcblk0p3\0" \
+	"mmcboot=setenv bootargs " CONFIG_BOOTARGS \
+		" root=${mmcroot} rw rootwait;" \
+		"bootz ${loadaddr} - ${fdt_addr}\0" \
+	"mmcload=mmc rescan;" \
+		"load mmc 0:2 ${loadaddr} ${bootimage};" \
+		"load mmc 0:2 ${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"
+
+#endif
 
 #endif	/* __CONFIG_SOCFPGA_COMMON_H__ */