[U-Boot] [PATCH] board: ls1012afrdm: overwrite CONFIG_EXTRA_ENV_SETTINGS

[U-Boot] [PATCH] board: ls1012afrdm: overwrite CONFIG_EXTRA_ENV_SETTINGS

[Prabhakar Kushwaha]

LS1012AFRDM has 512MB of DDR.
So update Kernel load address as 0x96000000 instead of default
0xa0000000.

Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
---
 include/configs/ls1012afrdm.h | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/include/configs/ls1012afrdm.h b/include/configs/ls1012afrdm.h
index ad81142..64dced2 100644
--- a/include/configs/ls1012afrdm.h
+++ b/include/configs/ls1012afrdm.h
@@ -39,4 +39,20 @@
 #define CONFIG_SYS_MEMTEST_START	0x80000000
 #define CONFIG_SYS_MEMTEST_END		0x9fffffff
 
+#undef CONFIG_EXTRA_ENV_SETTINGS
+#define CONFIG_EXTRA_ENV_SETTINGS		\
+	"initrd_high=0xffffffff\0"		\
+	"verify=no\0"				\
+	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
+	"loadaddr=0x80100000\0"			\
+	"kernel_addr=0x100000\0"		\
+	"ramdisk_addr=0x800000\0"		\
+	"ramdisk_size=0x2000000\0"		\
+	"fdt_high=0xffffffffffffffff\0"		\
+	"initrd_high=0xffffffffffffffff\0"	\
+	"kernel_start=0xa00000\0"		\
+	"kernel_load=0x96000000\0"		\
+	"kernel_size=0x2800000\0"		\
+	"console=ttyAMA0,38400n8\0"
+
 #endif /* __LS1012ARDB_H__ */
-- 
1.9.1

[U-Boot] [PATCH] board: ls1012aqds: Update LBMAP_MASK and RST_CTL_RESET

[Prabhakar Kushwaha]

qixis_reset altbank usagge ~QIXIS_LBMAP_MASK in code. So define
inverse value QIXIS_LBMAP_MASK.

Also, update QIXIS_RST_CTL_RESET value to keep RST_CTL[REQ_MOD]
as 0b11 i.e. PORESET during qixis_reset

Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
---
 include/configs/ls1012aqds.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h
index fcf402c..6e31ca0 100644
--- a/include/configs/ls1012aqds.h
+++ b/include/configs/ls1012aqds.h
@@ -28,11 +28,11 @@
 #define CONFIG_SYS_I2C_FPGA_ADDR	0x66
 #define QIXIS_LBMAP_BRDCFG_REG		0x04
 #define QIXIS_LBMAP_SWITCH		6
-#define QIXIS_LBMAP_MASK		0xf7
+#define QIXIS_LBMAP_MASK		0x08
 #define QIXIS_LBMAP_SHIFT		0
 #define QIXIS_LBMAP_DFLTBANK		0x00
 #define QIXIS_LBMAP_ALTBANK		0x08
-#define QIXIS_RST_CTL_RESET		0x41
+#define QIXIS_RST_CTL_RESET		0x31
 #define QIXIS_RCFG_CTL_RECONFIG_IDLE	0x20
 #define QIXIS_RCFG_CTL_RECONFIG_START	0x21
 #define QIXIS_RCFG_CTL_WATCHDOG_ENBLE	0x08
-- 
1.9.1

[U-Boot] [PATCH] board: ls1012afrdm: overwrite CONFIG_EXTRA_ENV_SETTINGS

[york sun]

On 07/19/2016 01:36 AM, Prabhakar Kushwaha wrote:
> LS1012AFRDM has 512MB of DDR.
> So update Kernel load address as 0x96000000 instead of default
> 0xa0000000.
>
> Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
> ---
>  include/configs/ls1012afrdm.h | 16 ++++++++++++++++
>  1 file changed, 16 insertions(+)
>
> diff --git a/include/configs/ls1012afrdm.h b/include/configs/ls1012afrdm.h
> index ad81142..64dced2 100644
> --- a/include/configs/ls1012afrdm.h
> +++ b/include/configs/ls1012afrdm.h
> @@ -39,4 +39,20 @@
>  #define CONFIG_SYS_MEMTEST_START	0x80000000
>  #define CONFIG_SYS_MEMTEST_END		0x9fffffff
>
> +#undef CONFIG_EXTRA_ENV_SETTINGS
> +#define CONFIG_EXTRA_ENV_SETTINGS		\
> +	"initrd_high=0xffffffff\0"		\
> +	"verify=no\0"				\
> +	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
> +	"loadaddr=0x80100000\0"			\
> +	"kernel_addr=0x100000\0"		\
> +	"ramdisk_addr=0x800000\0"		\

Is this used?

> +	"ramdisk_size=0x2000000\0"		\

Is this used?

> +	"fdt_high=0xffffffffffffffff\0"		\
> +	"initrd_high=0xffffffffffffffff\0"	\
> +	"kernel_start=0xa00000\0"		\
> +	"kernel_load=0x96000000\0"		\
> +	"kernel_size=0x2800000\0"		\
> +	"console=ttyAMA0,38400n8\0"

Is this correct?

York

[U-Boot] [PATCH] board: ls1012aqds: Update LBMAP_MASK and RST_CTL_RESET

[york sun]

On 07/19/2016 01:36 AM, Prabhakar Kushwaha wrote:
> qixis_reset altbank usagge ~QIXIS_LBMAP_MASK in code. So define
> inverse value QIXIS_LBMAP_MASK.
>
> Also, update QIXIS_RST_CTL_RESET value to keep RST_CTL[REQ_MOD]
> as 0b11 i.e. PORESET during qixis_reset
>
> Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
> ---
>  include/configs/ls1012aqds.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>

Applied to fsl-qoriq master, awaiting upstream.
Thanks.

York