[PATCH 1/2] SAMA5D4EK - Now mostly supports booting Android from NAND.

[PATCH 1/2] SAMA5D4EK - Now mostly supports booting Android from NAND.

[Doug Brainard]

---
 arch/arm/boards/sama5d4ek/env/config | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arm/boards/sama5d4ek/env/config b/arch/arm/boards/sama5d4ek/env/config
index 1007345..ee86c07 100644
--- a/arch/arm/boards/sama5d4ek/env/config
+++ b/arch/arm/boards/sama5d4ek/env/config
@@ -11,16 +11,16 @@ ip=dhcp
 #eth0.serverip=a.b.c.d
 
 # can be either 'nfs', 'tftp', 'nor' or 'nand'
-kernel_loc=nfs
+kernel_loc=nand
 # can be either 'net', 'nor', 'nand' or 'initrd'
-rootfs_loc=net
+rootfs_loc=nand
 # can be either 'nfs', 'tftp', 'nand' or empty
-oftree_loc=nfs
+oftree_loc=nand
 
 # can be either 'jffs2' or 'ubifs'
 rootfs_type=ubifs
 rootfsimage=root.$rootfs_type
-ubiroot=rootfs
+ubiroot=system
 
 # The image type of the kernel. Can be uimage, zimage, raw, or raw_lzo
 kernelimage=zImage
@@ -29,14 +29,14 @@ kernelimage=zImage
 #kernelimage=Image.lzo
 
 nand_device=atmel_nand
-nand_parts="256k(at91bootstrap),512k(barebox)ro,256k(bareboxenv),256k(bareboxenv2),256k(spare),512k(oftree),6M(kernel),-(rootfs)"
-rootfs_mtdblock_nand=7
+nand_parts="256k(at91bootstrap),512k(barebox)ro,256k(bareboxenv),256k(bareboxenv2),256k(spare),512k(oftree),6M(kernel),8M(recovery),176M(system),304M(userdata),-(cache)"
+rootfs_mtdblock_nand=10
 
 m25p80_parts="64k(bootstrap),384k(barebox),256k(bareboxenv),256k(bareboxenv2),128k(oftree),-(updater)"
 
 autoboot_timeout=3
 
-bootargs="console=ttyS0,115200"
+bootargs="console=ttyS0,115200 ubi.mtd=8 ubi.mtd=9 init=/init androidboot.hardware=sama5-pda androidboot.lcd=wvga"
 
 # set a fancy prompt (if support is compiled in)
 PS1="\e[1;32mbarebox@\e[1;31m\h:\w\e[0m\n# "
-- 
2.3.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/2] Switched SAMA5D4EK development board to the newer environment method.

[Doug Brainard]

---
 arch/arm/boards/sama5d4ek/env/bin/init_board       | 15 --------
 arch/arm/boards/sama5d4ek/env/boot/nand-ubi        |  8 +++++
 arch/arm/boards/sama5d4ek/env/config               | 42 ----------------------
 arch/arm/boards/sama5d4ek/env/init/mtdparts-nand   |  6 ++++
 arch/arm/boards/sama5d4ek/env/init/ps1             |  7 ++++
 arch/arm/boards/sama5d4ek/env/init/splash          | 10 ++++++
 arch/arm/boards/sama5d4ek/env/nv/boot.default      |  1 +
 arch/arm/boards/sama5d4ek/env/nv/bootargs.base     |  1 +
 arch/arm/boards/sama5d4ek/env/nv/hostname          |  1 +
 .../boards/sama5d4ek/env/nv/linux.bootargs.console |  1 +
 arch/arm/configs/sama5d4ek_defconfig               |  5 +--
 arch/arm/mach-at91/Kconfig                         |  1 +
 12 files changed, 39 insertions(+), 59 deletions(-)
 delete mode 100644 arch/arm/boards/sama5d4ek/env/bin/init_board
 create mode 100644 arch/arm/boards/sama5d4ek/env/boot/nand-ubi
 delete mode 100644 arch/arm/boards/sama5d4ek/env/config
 create mode 100644 arch/arm/boards/sama5d4ek/env/init/mtdparts-nand
 create mode 100644 arch/arm/boards/sama5d4ek/env/init/ps1
 create mode 100644 arch/arm/boards/sama5d4ek/env/init/splash
 create mode 100644 arch/arm/boards/sama5d4ek/env/nv/boot.default
 create mode 100644 arch/arm/boards/sama5d4ek/env/nv/bootargs.base
 create mode 100644 arch/arm/boards/sama5d4ek/env/nv/hostname
 create mode 100644 arch/arm/boards/sama5d4ek/env/nv/linux.bootargs.console

diff --git a/arch/arm/boards/sama5d4ek/env/bin/init_board b/arch/arm/boards/sama5d4ek/env/bin/init_board
deleted file mode 100644
index f3d417e..0000000
--- a/arch/arm/boards/sama5d4ek/env/bin/init_board
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-PATH=/env/bin
-export PATH
-
-. /env/config
-
-splash=/env/splash.png
-
-if [ -f ${splash} -a -e /dev/fb0 ]; then
-	splash -o ${splash}
-	fb0.enable=1
-fi
-
-exit 1
diff --git a/arch/arm/boards/sama5d4ek/env/boot/nand-ubi b/arch/arm/boards/sama5d4ek/env/boot/nand-ubi
new file mode 100644
index 0000000..e8d6bde
--- /dev/null
+++ b/arch/arm/boards/sama5d4ek/env/boot/nand-ubi
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+global.bootm.image="/dev/nand0.kernel.bb"
+global.bootm.oftree="/dev/nand0.oftree.bb"
+
+bootargs-ip
+
+global.linux.bootargs.dyn.root="root=ubi0:nand0.rootfs ubi.mtd=nand0.rootfs rootfstype=ubifs noinitrd"
diff --git a/arch/arm/boards/sama5d4ek/env/config b/arch/arm/boards/sama5d4ek/env/config
deleted file mode 100644
index ee86c07..0000000
--- a/arch/arm/boards/sama5d4ek/env/config
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-# use 'dhcp' to do dhcp in barebox and in kernel
-# use 'none' if you want to skip kernel ip autoconfiguration
-ip=dhcp
-
-# or set your networking parameters here
-#eth0.ipaddr=a.b.c.d
-#eth0.netmask=a.b.c.d
-#eth0.gateway=a.b.c.d
-#eth0.serverip=a.b.c.d
-
-# can be either 'nfs', 'tftp', 'nor' or 'nand'
-kernel_loc=nand
-# can be either 'net', 'nor', 'nand' or 'initrd'
-rootfs_loc=nand
-# can be either 'nfs', 'tftp', 'nand' or empty
-oftree_loc=nand
-
-# can be either 'jffs2' or 'ubifs'
-rootfs_type=ubifs
-rootfsimage=root.$rootfs_type
-ubiroot=system
-
-# The image type of the kernel. Can be uimage, zimage, raw, or raw_lzo
-kernelimage=zImage
-#kernelimage=uImage
-#kernelimage=Image
-#kernelimage=Image.lzo
-
-nand_device=atmel_nand
-nand_parts="256k(at91bootstrap),512k(barebox)ro,256k(bareboxenv),256k(bareboxenv2),256k(spare),512k(oftree),6M(kernel),8M(recovery),176M(system),304M(userdata),-(cache)"
-rootfs_mtdblock_nand=10
-
-m25p80_parts="64k(bootstrap),384k(barebox),256k(bareboxenv),256k(bareboxenv2),128k(oftree),-(updater)"
-
-autoboot_timeout=3
-
-bootargs="console=ttyS0,115200 ubi.mtd=8 ubi.mtd=9 init=/init androidboot.hardware=sama5-pda androidboot.lcd=wvga"
-
-# set a fancy prompt (if support is compiled in)
-PS1="\e[1;32mbarebox@\e[1;31m\h:\w\e[0m\n# "
diff --git a/arch/arm/boards/sama5d4ek/env/init/mtdparts-nand b/arch/arm/boards/sama5d4ek/env/init/mtdparts-nand
new file mode 100644
index 0000000..f20a135
--- /dev/null
+++ b/arch/arm/boards/sama5d4ek/env/init/mtdparts-nand
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+mtdparts="256k(nand0.at91bootstrap),512k(nand0.barebox)ro,256k(nand0.bareboxenv),256k(nand0.bareboxenv2),256k(nand0.spare),512k(nand0.oftree),6M(nand0.kernel),-(nand0.rootfs)"
+kernelname="atmel_nand"
+
+mtdparts-add -b -d nand0 -k ${kernelname} -p ${mtdparts}
diff --git a/arch/arm/boards/sama5d4ek/env/init/ps1 b/arch/arm/boards/sama5d4ek/env/init/ps1
new file mode 100644
index 0000000..c0ec1a5
--- /dev/null
+++ b/arch/arm/boards/sama5d4ek/env/init/ps1
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ ${global.allow_color} = "true" ]; then
+	export PS1="\e[1;32mbarebox@\e[1;31m\h:\w\e[0m\n# "
+else
+        export PS1="barebox@\h:\w "
+fi
diff --git a/arch/arm/boards/sama5d4ek/env/init/splash b/arch/arm/boards/sama5d4ek/env/init/splash
new file mode 100644
index 0000000..190ef31
--- /dev/null
+++ b/arch/arm/boards/sama5d4ek/env/init/splash
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+splash=/env/splash.png
+
+if [ -f ${splash} -a -e /dev/fb0 ]; then
+	splash -o ${splash}
+	fb0.enable=1
+fi
+
+exit 1
diff --git a/arch/arm/boards/sama5d4ek/env/nv/boot.default b/arch/arm/boards/sama5d4ek/env/nv/boot.default
new file mode 100644
index 0000000..d9dfbbc
--- /dev/null
+++ b/arch/arm/boards/sama5d4ek/env/nv/boot.default
@@ -0,0 +1 @@
+nand-ubi
diff --git a/arch/arm/boards/sama5d4ek/env/nv/bootargs.base b/arch/arm/boards/sama5d4ek/env/nv/bootargs.base
new file mode 100644
index 0000000..476b1fb
--- /dev/null
+++ b/arch/arm/boards/sama5d4ek/env/nv/bootargs.base
@@ -0,0 +1 @@
+console=ttyS0,115200
diff --git a/arch/arm/boards/sama5d4ek/env/nv/hostname b/arch/arm/boards/sama5d4ek/env/nv/hostname
new file mode 100644
index 0000000..b74056d
--- /dev/null
+++ b/arch/arm/boards/sama5d4ek/env/nv/hostname
@@ -0,0 +1 @@
+sama5d4ek
diff --git a/arch/arm/boards/sama5d4ek/env/nv/linux.bootargs.console b/arch/arm/boards/sama5d4ek/env/nv/linux.bootargs.console
new file mode 100644
index 0000000..476b1fb
--- /dev/null
+++ b/arch/arm/boards/sama5d4ek/env/nv/linux.bootargs.console
@@ -0,0 +1 @@
+console=ttyS0,115200
diff --git a/arch/arm/configs/sama5d4ek_defconfig b/arch/arm/configs/sama5d4ek_defconfig
index bbf254a..f050fe4 100644
--- a/arch/arm/configs/sama5d4ek_defconfig
+++ b/arch/arm/configs/sama5d4ek_defconfig
@@ -9,13 +9,12 @@ CONFIG_MALLOC_SIZE=0xA00000
 CONFIG_EXPERIMENTAL=y
 CONFIG_MALLOC_TLSF=y
 CONFIG_PROMPT="A5D4EK:"
-CONFIG_GLOB=y
 CONFIG_PROMPT_HUSH_PS2="y"
 CONFIG_HUSH_FANCY_PROMPT=y
 CONFIG_CMDLINE_EDITING=y
 CONFIG_AUTO_COMPLETE=y
 CONFIG_CONSOLE_ACTIVATE_ALL=y
-CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y
+CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
 CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/sama5d4ek/env"
 CONFIG_DEBUG_INFO=y
 # CONFIG_CMD_ARM_CPUINFO is not set
@@ -35,6 +34,8 @@ CONFIG_CMD_PARTITION=y
 CONFIG_CMD_EXPORT=y
 CONFIG_CMD_LOADENV=y
 CONFIG_CMD_PRINTENV=y
+CONFIG_CMD_MAGICVAR=y
+CONFIG_CMD_MAGICVAR_HELP=y
 CONFIG_CMD_SAVEENV=y
 CONFIG_CMD_FILETYPE=y
 CONFIG_CMD_SLEEP=y
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 9ee4f30..7207232 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -489,6 +489,7 @@ choice
 
 config MACH_SAMA5D4EK
 	bool "Atmel SAMA5D4 Evaluation Kit"
+	select HAVE_DEFAULT_ENVIRONMENT_NEW
 	help
 	  Select this if you are using Atmel's SAMA5D4-EK Evaluation Kit.
 
-- 
2.3.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/2] SAMA5D4EK - Now mostly supports booting Android from NAND.

[Bo Shen]

Hi Doug Brainard,

On 02/10/2015 10:28 PM, Doug Brainard wrote:
> ---
>   arch/arm/boards/sama5d4ek/env/config | 14 +++++++-------
>   1 file changed, 7 insertions(+), 7 deletions(-)

As this file will be totally discard in patch 2/2. So, I think no need 
to add this patch. And also it change the default boot setting to 
Android only.

> diff --git a/arch/arm/boards/sama5d4ek/env/config b/arch/arm/boards/sama5d4ek/env/config
> index 1007345..ee86c07 100644
> --- a/arch/arm/boards/sama5d4ek/env/config
> +++ b/arch/arm/boards/sama5d4ek/env/config
> @@ -11,16 +11,16 @@ ip=dhcp
>   #eth0.serverip=a.b.c.d
>
>   # can be either 'nfs', 'tftp', 'nor' or 'nand'
> -kernel_loc=nfs
> +kernel_loc=nand
>   # can be either 'net', 'nor', 'nand' or 'initrd'
> -rootfs_loc=net
> +rootfs_loc=nand
>   # can be either 'nfs', 'tftp', 'nand' or empty
> -oftree_loc=nfs
> +oftree_loc=nand
>
>   # can be either 'jffs2' or 'ubifs'
>   rootfs_type=ubifs
>   rootfsimage=root.$rootfs_type
> -ubiroot=rootfs
> +ubiroot=system
>
>   # The image type of the kernel. Can be uimage, zimage, raw, or raw_lzo
>   kernelimage=zImage
> @@ -29,14 +29,14 @@ kernelimage=zImage
>   #kernelimage=Image.lzo
>
>   nand_device=atmel_nand
> -nand_parts="256k(at91bootstrap),512k(barebox)ro,256k(bareboxenv),256k(bareboxenv2),256k(spare),512k(oftree),6M(kernel),-(rootfs)"
> -rootfs_mtdblock_nand=7
> +nand_parts="256k(at91bootstrap),512k(barebox)ro,256k(bareboxenv),256k(bareboxenv2),256k(spare),512k(oftree),6M(kernel),8M(recovery),176M(system),304M(userdata),-(cache)"
> +rootfs_mtdblock_nand=10
>
>   m25p80_parts="64k(bootstrap),384k(barebox),256k(bareboxenv),256k(bareboxenv2),128k(oftree),-(updater)"
>
>   autoboot_timeout=3
>
> -bootargs="console=ttyS0,115200"
> +bootargs="console=ttyS0,115200 ubi.mtd=8 ubi.mtd=9 init=/init androidboot.hardware=sama5-pda androidboot.lcd=wvga"
>
>   # set a fancy prompt (if support is compiled in)
>   PS1="\e[1;32mbarebox@\e[1;31m\h:\w\e[0m\n# "
>

Best Regards,
Bo Shen

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 2/2] Switched SAMA5D4EK development board to the newer environment method.

[Bo Shen]

Hi Doug Brainard,

On 02/10/2015 10:28 PM, Doug Brainard wrote:
> ---
>   arch/arm/boards/sama5d4ek/env/bin/init_board       | 15 --------
>   arch/arm/boards/sama5d4ek/env/boot/nand-ubi        |  8 +++++
>   arch/arm/boards/sama5d4ek/env/config               | 42 ----------------------
>   arch/arm/boards/sama5d4ek/env/init/mtdparts-nand   |  6 ++++
>   arch/arm/boards/sama5d4ek/env/init/ps1             |  7 ++++
>   arch/arm/boards/sama5d4ek/env/init/splash          | 10 ++++++
>   arch/arm/boards/sama5d4ek/env/nv/boot.default      |  1 +
>   arch/arm/boards/sama5d4ek/env/nv/bootargs.base     |  1 +
>   arch/arm/boards/sama5d4ek/env/nv/hostname          |  1 +
>   .../boards/sama5d4ek/env/nv/linux.bootargs.console |  1 +
>   arch/arm/configs/sama5d4ek_defconfig               |  5 +--
>   arch/arm/mach-at91/Kconfig                         |  1 +
>   12 files changed, 39 insertions(+), 59 deletions(-)
>   delete mode 100644 arch/arm/boards/sama5d4ek/env/bin/init_board
>   create mode 100644 arch/arm/boards/sama5d4ek/env/boot/nand-ubi
>   delete mode 100644 arch/arm/boards/sama5d4ek/env/config
>   create mode 100644 arch/arm/boards/sama5d4ek/env/init/mtdparts-nand
>   create mode 100644 arch/arm/boards/sama5d4ek/env/init/ps1
>   create mode 100644 arch/arm/boards/sama5d4ek/env/init/splash
>   create mode 100644 arch/arm/boards/sama5d4ek/env/nv/boot.default
>   create mode 100644 arch/arm/boards/sama5d4ek/env/nv/bootargs.base
>   create mode 100644 arch/arm/boards/sama5d4ek/env/nv/hostname
>   create mode 100644 arch/arm/boards/sama5d4ek/env/nv/linux.bootargs.console
>
> diff --git a/arch/arm/boards/sama5d4ek/env/bin/init_board b/arch/arm/boards/sama5d4ek/env/bin/init_board
> deleted file mode 100644
> index f3d417e..0000000
> --- a/arch/arm/boards/sama5d4ek/env/bin/init_board
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -#!/bin/sh
> -
> -PATH=/env/bin
> -export PATH
> -
> -. /env/config
> -
> -splash=/env/splash.png
> -
> -if [ -f ${splash} -a -e /dev/fb0 ]; then
> -	splash -o ${splash}
> -	fb0.enable=1
> -fi
> -
> -exit 1
> diff --git a/arch/arm/boards/sama5d4ek/env/boot/nand-ubi b/arch/arm/boards/sama5d4ek/env/boot/nand-ubi
> new file mode 100644
> index 0000000..e8d6bde
> --- /dev/null
> +++ b/arch/arm/boards/sama5d4ek/env/boot/nand-ubi
> @@ -0,0 +1,8 @@
> +#!/bin/sh
> +
> +global.bootm.image="/dev/nand0.kernel.bb"
> +global.bootm.oftree="/dev/nand0.oftree.bb"
> +
> +bootargs-ip
> +
> +global.linux.bootargs.dyn.root="root=ubi0:nand0.rootfs ubi.mtd=nand0.rootfs rootfstype=ubifs noinitrd"
> diff --git a/arch/arm/boards/sama5d4ek/env/config b/arch/arm/boards/sama5d4ek/env/config
> deleted file mode 100644
> index ee86c07..0000000
> --- a/arch/arm/boards/sama5d4ek/env/config
> +++ /dev/null
> @@ -1,42 +0,0 @@
> -#!/bin/sh
> -
> -# use 'dhcp' to do dhcp in barebox and in kernel
> -# use 'none' if you want to skip kernel ip autoconfiguration
> -ip=dhcp
> -
> -# or set your networking parameters here
> -#eth0.ipaddr=a.b.c.d
> -#eth0.netmask=a.b.c.d
> -#eth0.gateway=a.b.c.d
> -#eth0.serverip=a.b.c.d
> -
> -# can be either 'nfs', 'tftp', 'nor' or 'nand'
> -kernel_loc=nand
> -# can be either 'net', 'nor', 'nand' or 'initrd'
> -rootfs_loc=nand
> -# can be either 'nfs', 'tftp', 'nand' or empty
> -oftree_loc=nand
> -
> -# can be either 'jffs2' or 'ubifs'
> -rootfs_type=ubifs
> -rootfsimage=root.$rootfs_type
> -ubiroot=system
> -
> -# The image type of the kernel. Can be uimage, zimage, raw, or raw_lzo
> -kernelimage=zImage
> -#kernelimage=uImage
> -#kernelimage=Image
> -#kernelimage=Image.lzo
> -
> -nand_device=atmel_nand
> -nand_parts="256k(at91bootstrap),512k(barebox)ro,256k(bareboxenv),256k(bareboxenv2),256k(spare),512k(oftree),6M(kernel),8M(recovery),176M(system),304M(userdata),-(cache)"
> -rootfs_mtdblock_nand=10
> -
> -m25p80_parts="64k(bootstrap),384k(barebox),256k(bareboxenv),256k(bareboxenv2),128k(oftree),-(updater)"
> -
> -autoboot_timeout=3
> -
> -bootargs="console=ttyS0,115200 ubi.mtd=8 ubi.mtd=9 init=/init androidboot.hardware=sama5-pda androidboot.lcd=wvga"
> -
> -# set a fancy prompt (if support is compiled in)
> -PS1="\e[1;32mbarebox@\e[1;31m\h:\w\e[0m\n# "
> diff --git a/arch/arm/boards/sama5d4ek/env/init/mtdparts-nand b/arch/arm/boards/sama5d4ek/env/init/mtdparts-nand
> new file mode 100644
> index 0000000..f20a135
> --- /dev/null
> +++ b/arch/arm/boards/sama5d4ek/env/init/mtdparts-nand
> @@ -0,0 +1,6 @@
> +#!/bin/sh
> +
> +mtdparts="256k(nand0.at91bootstrap),512k(nand0.barebox)ro,256k(nand0.bareboxenv),256k(nand0.bareboxenv2),256k(nand0.spare),512k(nand0.oftree),6M(nand0.kernel),-(nand0.rootfs)"
> +kernelname="atmel_nand"
> +
> +mtdparts-add -b -d nand0 -k ${kernelname} -p ${mtdparts}

Using this type of partition table make the file system can not mount 
successfully.

I remove the "nand0." for partition name, then it is OK. After this 
change, it won't keep consistent with the partition table name.

Now boot up the barebox, the partition for nand is: "/dev/barebox", 
"/dev/barebox.bb" while not "/dev/nand0.barebox", 
/dev/nand0.barebox.bb". I am thinking would it be possible to keep the 
consistent?

> diff --git a/arch/arm/boards/sama5d4ek/env/init/ps1 b/arch/arm/boards/sama5d4ek/env/init/ps1
> new file mode 100644
> index 0000000..c0ec1a5
> --- /dev/null
> +++ b/arch/arm/boards/sama5d4ek/env/init/ps1
> @@ -0,0 +1,7 @@
> +#!/bin/sh
> +
> +if [ ${global.allow_color} = "true" ]; then
> +	export PS1="\e[1;32mbarebox@\e[1;31m\h:\w\e[0m\n# "
> +else
> +        export PS1="barebox@\h:\w "
> +fi
> diff --git a/arch/arm/boards/sama5d4ek/env/init/splash b/arch/arm/boards/sama5d4ek/env/init/splash
> new file mode 100644
> index 0000000..190ef31
> --- /dev/null
> +++ b/arch/arm/boards/sama5d4ek/env/init/splash
> @@ -0,0 +1,10 @@
> +#!/bin/sh
> +
> +splash=/env/splash.png
> +
> +if [ -f ${splash} -a -e /dev/fb0 ]; then
> +	splash -o ${splash}
> +	fb0.enable=1
> +fi
> +
> +exit 1
> diff --git a/arch/arm/boards/sama5d4ek/env/nv/boot.default b/arch/arm/boards/sama5d4ek/env/nv/boot.default
> new file mode 100644
> index 0000000..d9dfbbc
> --- /dev/null
> +++ b/arch/arm/boards/sama5d4ek/env/nv/boot.default
> @@ -0,0 +1 @@
> +nand-ubi
> diff --git a/arch/arm/boards/sama5d4ek/env/nv/bootargs.base b/arch/arm/boards/sama5d4ek/env/nv/bootargs.base
> new file mode 100644
> index 0000000..476b1fb
> --- /dev/null
> +++ b/arch/arm/boards/sama5d4ek/env/nv/bootargs.base
> @@ -0,0 +1 @@
> +console=ttyS0,115200

Till now, I don't know the difference between "bootargs.base" (here 
maybe linux.bootargs.base (?)) and "linux.bootargs.console"

> diff --git a/arch/arm/boards/sama5d4ek/env/nv/hostname b/arch/arm/boards/sama5d4ek/env/nv/hostname
> new file mode 100644
> index 0000000..b74056d
> --- /dev/null
> +++ b/arch/arm/boards/sama5d4ek/env/nv/hostname
> @@ -0,0 +1 @@
> +sama5d4ek
> diff --git a/arch/arm/boards/sama5d4ek/env/nv/linux.bootargs.console b/arch/arm/boards/sama5d4ek/env/nv/linux.bootargs.console
> new file mode 100644
> index 0000000..476b1fb
> --- /dev/null
> +++ b/arch/arm/boards/sama5d4ek/env/nv/linux.bootargs.console
> @@ -0,0 +1 @@
> +console=ttyS0,115200
> diff --git a/arch/arm/configs/sama5d4ek_defconfig b/arch/arm/configs/sama5d4ek_defconfig
> index bbf254a..f050fe4 100644
> --- a/arch/arm/configs/sama5d4ek_defconfig
> +++ b/arch/arm/configs/sama5d4ek_defconfig
> @@ -9,13 +9,12 @@ CONFIG_MALLOC_SIZE=0xA00000
>   CONFIG_EXPERIMENTAL=y
>   CONFIG_MALLOC_TLSF=y
>   CONFIG_PROMPT="A5D4EK:"
> -CONFIG_GLOB=y
>   CONFIG_PROMPT_HUSH_PS2="y"
>   CONFIG_HUSH_FANCY_PROMPT=y
>   CONFIG_CMDLINE_EDITING=y
>   CONFIG_AUTO_COMPLETE=y
>   CONFIG_CONSOLE_ACTIVATE_ALL=y
> -CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y
> +CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
>   CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/sama5d4ek/env"
>   CONFIG_DEBUG_INFO=y
>   # CONFIG_CMD_ARM_CPUINFO is not set
> @@ -35,6 +34,8 @@ CONFIG_CMD_PARTITION=y
>   CONFIG_CMD_EXPORT=y
>   CONFIG_CMD_LOADENV=y
>   CONFIG_CMD_PRINTENV=y
> +CONFIG_CMD_MAGICVAR=y
> +CONFIG_CMD_MAGICVAR_HELP=y
>   CONFIG_CMD_SAVEENV=y
>   CONFIG_CMD_FILETYPE=y
>   CONFIG_CMD_SLEEP=y
> diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
> index 9ee4f30..7207232 100644
> --- a/arch/arm/mach-at91/Kconfig
> +++ b/arch/arm/mach-at91/Kconfig
> @@ -489,6 +489,7 @@ choice
>
>   config MACH_SAMA5D4EK
>   	bool "Atmel SAMA5D4 Evaluation Kit"
> +	select HAVE_DEFAULT_ENVIRONMENT_NEW
>   	help
>   	  Select this if you are using Atmel's SAMA5D4-EK Evaluation Kit.
>
>

Best Regards,
Bo Shen

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 2/2] Switched SAMA5D4EK development board to the newer environment method.

[Doug Brainard]

Bo,

What error are you seeing?  It was booting into Linux for me with what
I submitted.

However, I was unable to get things working without the "nand0." piece
for each partition due to what you are seeing.  I based that change on
what I saw in mtdparts-nand file in the telit-evk-pro3 board
directory.  Any idea what would be causing that not to add the
"nand0." automatically?  I'd prefer to remove it.

"bootargs.base" seems to be setting the console for barebox only.  I
had to add "linux.bootargs.console" to have the kernel command include
the console and output the boot information.  If I've misunderstood
something, let me know, and I'll modify it.

Thanks,

Doug


On Tue, Feb 10, 2015 at 7:34 PM, Bo Shen <voice.shen@atmel.com> wrote:
> Hi Doug Brainard,
>
>
> On 02/10/2015 10:28 PM, Doug Brainard wrote:
>>
>> ---
>>   arch/arm/boards/sama5d4ek/env/bin/init_board       | 15 --------
>>   arch/arm/boards/sama5d4ek/env/boot/nand-ubi        |  8 +++++
>>   arch/arm/boards/sama5d4ek/env/config               | 42
>> ----------------------
>>   arch/arm/boards/sama5d4ek/env/init/mtdparts-nand   |  6 ++++
>>   arch/arm/boards/sama5d4ek/env/init/ps1             |  7 ++++
>>   arch/arm/boards/sama5d4ek/env/init/splash          | 10 ++++++
>>   arch/arm/boards/sama5d4ek/env/nv/boot.default      |  1 +
>>   arch/arm/boards/sama5d4ek/env/nv/bootargs.base     |  1 +
>>   arch/arm/boards/sama5d4ek/env/nv/hostname          |  1 +
>>   .../boards/sama5d4ek/env/nv/linux.bootargs.console |  1 +
>>   arch/arm/configs/sama5d4ek_defconfig               |  5 +--
>>   arch/arm/mach-at91/Kconfig                         |  1 +
>>   12 files changed, 39 insertions(+), 59 deletions(-)
>>   delete mode 100644 arch/arm/boards/sama5d4ek/env/bin/init_board
>>   create mode 100644 arch/arm/boards/sama5d4ek/env/boot/nand-ubi
>>   delete mode 100644 arch/arm/boards/sama5d4ek/env/config
>>   create mode 100644 arch/arm/boards/sama5d4ek/env/init/mtdparts-nand
>>   create mode 100644 arch/arm/boards/sama5d4ek/env/init/ps1
>>   create mode 100644 arch/arm/boards/sama5d4ek/env/init/splash
>>   create mode 100644 arch/arm/boards/sama5d4ek/env/nv/boot.default
>>   create mode 100644 arch/arm/boards/sama5d4ek/env/nv/bootargs.base
>>   create mode 100644 arch/arm/boards/sama5d4ek/env/nv/hostname
>>   create mode 100644
>> arch/arm/boards/sama5d4ek/env/nv/linux.bootargs.console
>>
>> diff --git a/arch/arm/boards/sama5d4ek/env/bin/init_board
>> b/arch/arm/boards/sama5d4ek/env/bin/init_board
>> deleted file mode 100644
>> index f3d417e..0000000
>> --- a/arch/arm/boards/sama5d4ek/env/bin/init_board
>> +++ /dev/null
>> @@ -1,15 +0,0 @@
>> -#!/bin/sh
>> -
>> -PATH=/env/bin
>> -export PATH
>> -
>> -. /env/config
>> -
>> -splash=/env/splash.png
>> -
>> -if [ -f ${splash} -a -e /dev/fb0 ]; then
>> -       splash -o ${splash}
>> -       fb0.enable=1
>> -fi
>> -
>> -exit 1
>> diff --git a/arch/arm/boards/sama5d4ek/env/boot/nand-ubi
>> b/arch/arm/boards/sama5d4ek/env/boot/nand-ubi
>> new file mode 100644
>> index 0000000..e8d6bde
>> --- /dev/null
>> +++ b/arch/arm/boards/sama5d4ek/env/boot/nand-ubi
>> @@ -0,0 +1,8 @@
>> +#!/bin/sh
>> +
>> +global.bootm.image="/dev/nand0.kernel.bb"
>> +global.bootm.oftree="/dev/nand0.oftree.bb"
>> +
>> +bootargs-ip
>> +
>> +global.linux.bootargs.dyn.root="root=ubi0:nand0.rootfs
>> ubi.mtd=nand0.rootfs rootfstype=ubifs noinitrd"
>> diff --git a/arch/arm/boards/sama5d4ek/env/config
>> b/arch/arm/boards/sama5d4ek/env/config
>> deleted file mode 100644
>> index ee86c07..0000000
>> --- a/arch/arm/boards/sama5d4ek/env/config
>> +++ /dev/null
>> @@ -1,42 +0,0 @@
>> -#!/bin/sh
>> -
>> -# use 'dhcp' to do dhcp in barebox and in kernel
>> -# use 'none' if you want to skip kernel ip autoconfiguration
>> -ip=dhcp
>> -
>> -# or set your networking parameters here
>> -#eth0.ipaddr=a.b.c.d
>> -#eth0.netmask=a.b.c.d
>> -#eth0.gateway=a.b.c.d
>> -#eth0.serverip=a.b.c.d
>> -
>> -# can be either 'nfs', 'tftp', 'nor' or 'nand'
>> -kernel_loc=nand
>> -# can be either 'net', 'nor', 'nand' or 'initrd'
>> -rootfs_loc=nand
>> -# can be either 'nfs', 'tftp', 'nand' or empty
>> -oftree_loc=nand
>> -
>> -# can be either 'jffs2' or 'ubifs'
>> -rootfs_type=ubifs
>> -rootfsimage=root.$rootfs_type
>> -ubiroot=system
>> -
>> -# The image type of the kernel. Can be uimage, zimage, raw, or raw_lzo
>> -kernelimage=zImage
>> -#kernelimage=uImage
>> -#kernelimage=Image
>> -#kernelimage=Image.lzo
>> -
>> -nand_device=atmel_nand
>>
>> -nand_parts="256k(at91bootstrap),512k(barebox)ro,256k(bareboxenv),256k(bareboxenv2),256k(spare),512k(oftree),6M(kernel),8M(recovery),176M(system),304M(userdata),-(cache)"
>> -rootfs_mtdblock_nand=10
>> -
>>
>> -m25p80_parts="64k(bootstrap),384k(barebox),256k(bareboxenv),256k(bareboxenv2),128k(oftree),-(updater)"
>> -
>> -autoboot_timeout=3
>> -
>> -bootargs="console=ttyS0,115200 ubi.mtd=8 ubi.mtd=9 init=/init
>> androidboot.hardware=sama5-pda androidboot.lcd=wvga"
>> -
>> -# set a fancy prompt (if support is compiled in)
>> -PS1="\e[1;32mbarebox@\e[1;31m\h:\w\e[0m\n# "
>> diff --git a/arch/arm/boards/sama5d4ek/env/init/mtdparts-nand
>> b/arch/arm/boards/sama5d4ek/env/init/mtdparts-nand
>> new file mode 100644
>> index 0000000..f20a135
>> --- /dev/null
>> +++ b/arch/arm/boards/sama5d4ek/env/init/mtdparts-nand
>> @@ -0,0 +1,6 @@
>> +#!/bin/sh
>> +
>>
>> +mtdparts="256k(nand0.at91bootstrap),512k(nand0.barebox)ro,256k(nand0.bareboxenv),256k(nand0.bareboxenv2),256k(nand0.spare),512k(nand0.oftree),6M(nand0.kernel),-(nand0.rootfs)"
>> +kernelname="atmel_nand"
>> +
>> +mtdparts-add -b -d nand0 -k ${kernelname} -p ${mtdparts}
>
>
> Using this type of partition table make the file system can not mount
> successfully.
>
> I remove the "nand0." for partition name, then it is OK. After this change,
> it won't keep consistent with the partition table name.
>
> Now boot up the barebox, the partition for nand is: "/dev/barebox",
> "/dev/barebox.bb" while not "/dev/nand0.barebox", /dev/nand0.barebox.bb". I
> am thinking would it be possible to keep the consistent?
>
>
>> diff --git a/arch/arm/boards/sama5d4ek/env/init/ps1
>> b/arch/arm/boards/sama5d4ek/env/init/ps1
>> new file mode 100644
>> index 0000000..c0ec1a5
>> --- /dev/null
>> +++ b/arch/arm/boards/sama5d4ek/env/init/ps1
>> @@ -0,0 +1,7 @@
>> +#!/bin/sh
>> +
>> +if [ ${global.allow_color} = "true" ]; then
>> +       export PS1="\e[1;32mbarebox@\e[1;31m\h:\w\e[0m\n# "
>> +else
>> +        export PS1="barebox@\h:\w "
>> +fi
>> diff --git a/arch/arm/boards/sama5d4ek/env/init/splash
>> b/arch/arm/boards/sama5d4ek/env/init/splash
>> new file mode 100644
>> index 0000000..190ef31
>> --- /dev/null
>> +++ b/arch/arm/boards/sama5d4ek/env/init/splash
>> @@ -0,0 +1,10 @@
>> +#!/bin/sh
>> +
>> +splash=/env/splash.png
>> +
>> +if [ -f ${splash} -a -e /dev/fb0 ]; then
>> +       splash -o ${splash}
>> +       fb0.enable=1
>> +fi
>> +
>> +exit 1
>> diff --git a/arch/arm/boards/sama5d4ek/env/nv/boot.default
>> b/arch/arm/boards/sama5d4ek/env/nv/boot.default
>> new file mode 100644
>> index 0000000..d9dfbbc
>> --- /dev/null
>> +++ b/arch/arm/boards/sama5d4ek/env/nv/boot.default
>> @@ -0,0 +1 @@
>> +nand-ubi
>> diff --git a/arch/arm/boards/sama5d4ek/env/nv/bootargs.base
>> b/arch/arm/boards/sama5d4ek/env/nv/bootargs.base
>> new file mode 100644
>> index 0000000..476b1fb
>> --- /dev/null
>> +++ b/arch/arm/boards/sama5d4ek/env/nv/bootargs.base
>> @@ -0,0 +1 @@
>> +console=ttyS0,115200
>
>
> Till now, I don't know the difference between "bootargs.base" (here maybe
> linux.bootargs.base (?)) and "linux.bootargs.console"
>
>
>> diff --git a/arch/arm/boards/sama5d4ek/env/nv/hostname
>> b/arch/arm/boards/sama5d4ek/env/nv/hostname
>> new file mode 100644
>> index 0000000..b74056d
>> --- /dev/null
>> +++ b/arch/arm/boards/sama5d4ek/env/nv/hostname
>> @@ -0,0 +1 @@
>> +sama5d4ek
>> diff --git a/arch/arm/boards/sama5d4ek/env/nv/linux.bootargs.console
>> b/arch/arm/boards/sama5d4ek/env/nv/linux.bootargs.console
>> new file mode 100644
>> index 0000000..476b1fb
>> --- /dev/null
>> +++ b/arch/arm/boards/sama5d4ek/env/nv/linux.bootargs.console
>> @@ -0,0 +1 @@
>> +console=ttyS0,115200
>> diff --git a/arch/arm/configs/sama5d4ek_defconfig
>> b/arch/arm/configs/sama5d4ek_defconfig
>> index bbf254a..f050fe4 100644
>> --- a/arch/arm/configs/sama5d4ek_defconfig
>> +++ b/arch/arm/configs/sama5d4ek_defconfig
>> @@ -9,13 +9,12 @@ CONFIG_MALLOC_SIZE=0xA00000
>>   CONFIG_EXPERIMENTAL=y
>>   CONFIG_MALLOC_TLSF=y
>>   CONFIG_PROMPT="A5D4EK:"
>> -CONFIG_GLOB=y
>>   CONFIG_PROMPT_HUSH_PS2="y"
>>   CONFIG_HUSH_FANCY_PROMPT=y
>>   CONFIG_CMDLINE_EDITING=y
>>   CONFIG_AUTO_COMPLETE=y
>>   CONFIG_CONSOLE_ACTIVATE_ALL=y
>> -CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y
>> +CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
>>   CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/sama5d4ek/env"
>>   CONFIG_DEBUG_INFO=y
>>   # CONFIG_CMD_ARM_CPUINFO is not set
>> @@ -35,6 +34,8 @@ CONFIG_CMD_PARTITION=y
>>   CONFIG_CMD_EXPORT=y
>>   CONFIG_CMD_LOADENV=y
>>   CONFIG_CMD_PRINTENV=y
>> +CONFIG_CMD_MAGICVAR=y
>> +CONFIG_CMD_MAGICVAR_HELP=y
>>   CONFIG_CMD_SAVEENV=y
>>   CONFIG_CMD_FILETYPE=y
>>   CONFIG_CMD_SLEEP=y
>> diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
>> index 9ee4f30..7207232 100644
>> --- a/arch/arm/mach-at91/Kconfig
>> +++ b/arch/arm/mach-at91/Kconfig
>> @@ -489,6 +489,7 @@ choice
>>
>>   config MACH_SAMA5D4EK
>>         bool "Atmel SAMA5D4 Evaluation Kit"
>> +       select HAVE_DEFAULT_ENVIRONMENT_NEW
>>         help
>>           Select this if you are using Atmel's SAMA5D4-EK Evaluation Kit.
>>
>>
>
> Best Regards,
> Bo Shen

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/2] SAMA5D4EK - Now mostly supports booting Android from NAND.

[Doug Brainard]

Sorry, this was more me not understanding "git send-email" the first
time and how to keep it only sending the latest commit.

Doug


On Tue, Feb 10, 2015 at 6:30 PM, Bo Shen <voice.shen@atmel.com> wrote:
> Hi Doug Brainard,
>
> On 02/10/2015 10:28 PM, Doug Brainard wrote:
>>
>> ---
>>   arch/arm/boards/sama5d4ek/env/config | 14 +++++++-------
>>   1 file changed, 7 insertions(+), 7 deletions(-)
>
>
> As this file will be totally discard in patch 2/2. So, I think no need to
> add this patch. And also it change the default boot setting to Android only.
>
>
>> diff --git a/arch/arm/boards/sama5d4ek/env/config
>> b/arch/arm/boards/sama5d4ek/env/config
>> index 1007345..ee86c07 100644
>> --- a/arch/arm/boards/sama5d4ek/env/config
>> +++ b/arch/arm/boards/sama5d4ek/env/config
>> @@ -11,16 +11,16 @@ ip=dhcp
>>   #eth0.serverip=a.b.c.d
>>
>>   # can be either 'nfs', 'tftp', 'nor' or 'nand'
>> -kernel_loc=nfs
>> +kernel_loc=nand
>>   # can be either 'net', 'nor', 'nand' or 'initrd'
>> -rootfs_loc=net
>> +rootfs_loc=nand
>>   # can be either 'nfs', 'tftp', 'nand' or empty
>> -oftree_loc=nfs
>> +oftree_loc=nand
>>
>>   # can be either 'jffs2' or 'ubifs'
>>   rootfs_type=ubifs
>>   rootfsimage=root.$rootfs_type
>> -ubiroot=rootfs
>> +ubiroot=system
>>
>>   # The image type of the kernel. Can be uimage, zimage, raw, or raw_lzo
>>   kernelimage=zImage
>> @@ -29,14 +29,14 @@ kernelimage=zImage
>>   #kernelimage=Image.lzo
>>
>>   nand_device=atmel_nand
>>
>> -nand_parts="256k(at91bootstrap),512k(barebox)ro,256k(bareboxenv),256k(bareboxenv2),256k(spare),512k(oftree),6M(kernel),-(rootfs)"
>> -rootfs_mtdblock_nand=7
>>
>> +nand_parts="256k(at91bootstrap),512k(barebox)ro,256k(bareboxenv),256k(bareboxenv2),256k(spare),512k(oftree),6M(kernel),8M(recovery),176M(system),304M(userdata),-(cache)"
>> +rootfs_mtdblock_nand=10
>>
>>
>> m25p80_parts="64k(bootstrap),384k(barebox),256k(bareboxenv),256k(bareboxenv2),128k(oftree),-(updater)"
>>
>>   autoboot_timeout=3
>>
>> -bootargs="console=ttyS0,115200"
>> +bootargs="console=ttyS0,115200 ubi.mtd=8 ubi.mtd=9 init=/init
>> androidboot.hardware=sama5-pda androidboot.lcd=wvga"
>>
>>   # set a fancy prompt (if support is compiled in)
>>   PS1="\e[1;32mbarebox@\e[1;31m\h:\w\e[0m\n# "
>>
>
> Best Regards,
> Bo Shen

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/2] SAMA5D4EK - Now mostly supports booting Android from NAND.

[Jean-Christophe PLAGNIOL-VILLARD]

Nack

I use those board everyday on nfs boot

the boot choice is user specific

Best Regards,
J.
> On Feb 10, 2015, at 10:28 PM, Doug Brainard <dbrainard@brainardinsight.com> wrote:
> 
> ---
> arch/arm/boards/sama5d4ek/env/config | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/arm/boards/sama5d4ek/env/config b/arch/arm/boards/sama5d4ek/env/config
> index 1007345..ee86c07 100644
> --- a/arch/arm/boards/sama5d4ek/env/config
> +++ b/arch/arm/boards/sama5d4ek/env/config
> @@ -11,16 +11,16 @@ ip=dhcp
> #eth0.serverip=a.b.c.d
> 
> # can be either 'nfs', 'tftp', 'nor' or 'nand'
> -kernel_loc=nfs
> +kernel_loc=nand
> # can be either 'net', 'nor', 'nand' or 'initrd'
> -rootfs_loc=net
> +rootfs_loc=nand
> # can be either 'nfs', 'tftp', 'nand' or empty
> -oftree_loc=nfs
> +oftree_loc=nand
> 
> # can be either 'jffs2' or 'ubifs'
> rootfs_type=ubifs
> rootfsimage=root.$rootfs_type
> -ubiroot=rootfs
> +ubiroot=system
> 
> # The image type of the kernel. Can be uimage, zimage, raw, or raw_lzo
> kernelimage=zImage
> @@ -29,14 +29,14 @@ kernelimage=zImage
> #kernelimage=Image.lzo
> 
> nand_device=atmel_nand
> -nand_parts="256k(at91bootstrap),512k(barebox)ro,256k(bareboxenv),256k(bareboxenv2),256k(spare),512k(oftree),6M(kernel),-(rootfs)"
> -rootfs_mtdblock_nand=7
> +nand_parts="256k(at91bootstrap),512k(barebox)ro,256k(bareboxenv),256k(bareboxenv2),256k(spare),512k(oftree),6M(kernel),8M(recovery),176M(system),304M(userdata),-(cache)"
> +rootfs_mtdblock_nand=10
> 
> m25p80_parts="64k(bootstrap),384k(barebox),256k(bareboxenv),256k(bareboxenv2),128k(oftree),-(updater)"
> 
> autoboot_timeout=3
> 
> -bootargs="console=ttyS0,115200"
> +bootargs="console=ttyS0,115200 ubi.mtd=8 ubi.mtd=9 init=/init androidboot.hardware=sama5-pda androidboot.lcd=wvga"
> 
> # set a fancy prompt (if support is compiled in)
> PS1="\e[1;32mbarebox@\e[1;31m\h:\w\e[0m\n# "
> -- 
> 2.3.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 2/2] Switched SAMA5D4EK development board to the newer environment method.

[Jean-Christophe PLAGNIOL-VILLARD]

Hi,

	as state before I use the atmel board for bootp everyday as the defaultenv-2 does not support
	this Nack until it’s fixed

	I did send patch for this in the past but they did not hit the mainline

Best Regards,
J.
> On Feb 11, 2015, at 12:00 PM, Doug Brainard <dbrainard@brainardinsight.com> wrote:
> 
> Bo,
> 
> What error are you seeing?  It was booting into Linux for me with what
> I submitted.
> 
> However, I was unable to get things working without the "nand0." piece
> for each partition due to what you are seeing.  I based that change on
> what I saw in mtdparts-nand file in the telit-evk-pro3 board
> directory.  Any idea what would be causing that not to add the
> "nand0." automatically?  I'd prefer to remove it.
> 
> "bootargs.base" seems to be setting the console for barebox only.  I
> had to add "linux.bootargs.console" to have the kernel command include
> the console and output the boot information.  If I've misunderstood
> something, let me know, and I'll modify it.
> 
> Thanks,
> 
> Doug
> 
> 
> On Tue, Feb 10, 2015 at 7:34 PM, Bo Shen <voice.shen@atmel.com> wrote:
>> Hi Doug Brainard,
>> 
>> 
>> On 02/10/2015 10:28 PM, Doug Brainard wrote:
>>> 
>>> ---
>>>  arch/arm/boards/sama5d4ek/env/bin/init_board       | 15 --------
>>>  arch/arm/boards/sama5d4ek/env/boot/nand-ubi        |  8 +++++
>>>  arch/arm/boards/sama5d4ek/env/config               | 42
>>> ----------------------
>>>  arch/arm/boards/sama5d4ek/env/init/mtdparts-nand   |  6 ++++
>>>  arch/arm/boards/sama5d4ek/env/init/ps1             |  7 ++++
>>>  arch/arm/boards/sama5d4ek/env/init/splash          | 10 ++++++
>>>  arch/arm/boards/sama5d4ek/env/nv/boot.default      |  1 +
>>>  arch/arm/boards/sama5d4ek/env/nv/bootargs.base     |  1 +
>>>  arch/arm/boards/sama5d4ek/env/nv/hostname          |  1 +
>>>  .../boards/sama5d4ek/env/nv/linux.bootargs.console |  1 +
>>>  arch/arm/configs/sama5d4ek_defconfig               |  5 +--
>>>  arch/arm/mach-at91/Kconfig                         |  1 +
>>>  12 files changed, 39 insertions(+), 59 deletions(-)
>>>  delete mode 100644 arch/arm/boards/sama5d4ek/env/bin/init_board
>>>  create mode 100644 arch/arm/boards/sama5d4ek/env/boot/nand-ubi
>>>  delete mode 100644 arch/arm/boards/sama5d4ek/env/config
>>>  create mode 100644 arch/arm/boards/sama5d4ek/env/init/mtdparts-nand
>>>  create mode 100644 arch/arm/boards/sama5d4ek/env/init/ps1
>>>  create mode 100644 arch/arm/boards/sama5d4ek/env/init/splash
>>>  create mode 100644 arch/arm/boards/sama5d4ek/env/nv/boot.default
>>>  create mode 100644 arch/arm/boards/sama5d4ek/env/nv/bootargs.base
>>>  create mode 100644 arch/arm/boards/sama5d4ek/env/nv/hostname
>>>  create mode 100644
>>> arch/arm/boards/sama5d4ek/env/nv/linux.bootargs.console
>>> 
>>> diff --git a/arch/arm/boards/sama5d4ek/env/bin/init_board
>>> b/arch/arm/boards/sama5d4ek/env/bin/init_board
>>> deleted file mode 100644
>>> index f3d417e..0000000
>>> --- a/arch/arm/boards/sama5d4ek/env/bin/init_board
>>> +++ /dev/null
>>> @@ -1,15 +0,0 @@
>>> -#!/bin/sh
>>> -
>>> -PATH=/env/bin
>>> -export PATH
>>> -
>>> -. /env/config
>>> -
>>> -splash=/env/splash.png
>>> -
>>> -if [ -f ${splash} -a -e /dev/fb0 ]; then
>>> -       splash -o ${splash}
>>> -       fb0.enable=1
>>> -fi
>>> -
>>> -exit 1
>>> diff --git a/arch/arm/boards/sama5d4ek/env/boot/nand-ubi
>>> b/arch/arm/boards/sama5d4ek/env/boot/nand-ubi
>>> new file mode 100644
>>> index 0000000..e8d6bde
>>> --- /dev/null
>>> +++ b/arch/arm/boards/sama5d4ek/env/boot/nand-ubi
>>> @@ -0,0 +1,8 @@
>>> +#!/bin/sh
>>> +
>>> +global.bootm.image="/dev/nand0.kernel.bb"
>>> +global.bootm.oftree="/dev/nand0.oftree.bb"
>>> +
>>> +bootargs-ip
>>> +
>>> +global.linux.bootargs.dyn.root="root=ubi0:nand0.rootfs
>>> ubi.mtd=nand0.rootfs rootfstype=ubifs noinitrd"
>>> diff --git a/arch/arm/boards/sama5d4ek/env/config
>>> b/arch/arm/boards/sama5d4ek/env/config
>>> deleted file mode 100644
>>> index ee86c07..0000000
>>> --- a/arch/arm/boards/sama5d4ek/env/config
>>> +++ /dev/null
>>> @@ -1,42 +0,0 @@
>>> -#!/bin/sh
>>> -
>>> -# use 'dhcp' to do dhcp in barebox and in kernel
>>> -# use 'none' if you want to skip kernel ip autoconfiguration
>>> -ip=dhcp
>>> -
>>> -# or set your networking parameters here
>>> -#eth0.ipaddr=a.b.c.d
>>> -#eth0.netmask=a.b.c.d
>>> -#eth0.gateway=a.b.c.d
>>> -#eth0.serverip=a.b.c.d
>>> -
>>> -# can be either 'nfs', 'tftp', 'nor' or 'nand'
>>> -kernel_loc=nand
>>> -# can be either 'net', 'nor', 'nand' or 'initrd'
>>> -rootfs_loc=nand
>>> -# can be either 'nfs', 'tftp', 'nand' or empty
>>> -oftree_loc=nand
>>> -
>>> -# can be either 'jffs2' or 'ubifs'
>>> -rootfs_type=ubifs
>>> -rootfsimage=root.$rootfs_type
>>> -ubiroot=system
>>> -
>>> -# The image type of the kernel. Can be uimage, zimage, raw, or raw_lzo
>>> -kernelimage=zImage
>>> -#kernelimage=uImage
>>> -#kernelimage=Image
>>> -#kernelimage=Image.lzo
>>> -
>>> -nand_device=atmel_nand
>>> 
>>> -nand_parts="256k(at91bootstrap),512k(barebox)ro,256k(bareboxenv),256k(bareboxenv2),256k(spare),512k(oftree),6M(kernel),8M(recovery),176M(system),304M(userdata),-(cache)"
>>> -rootfs_mtdblock_nand=10
>>> -
>>> 
>>> -m25p80_parts="64k(bootstrap),384k(barebox),256k(bareboxenv),256k(bareboxenv2),128k(oftree),-(updater)"
>>> -
>>> -autoboot_timeout=3
>>> -
>>> -bootargs="console=ttyS0,115200 ubi.mtd=8 ubi.mtd=9 init=/init
>>> androidboot.hardware=sama5-pda androidboot.lcd=wvga"
>>> -
>>> -# set a fancy prompt (if support is compiled in)
>>> -PS1="\e[1;32mbarebox@\e[1;31m\h:\w\e[0m\n# "
>>> diff --git a/arch/arm/boards/sama5d4ek/env/init/mtdparts-nand
>>> b/arch/arm/boards/sama5d4ek/env/init/mtdparts-nand
>>> new file mode 100644
>>> index 0000000..f20a135
>>> --- /dev/null
>>> +++ b/arch/arm/boards/sama5d4ek/env/init/mtdparts-nand
>>> @@ -0,0 +1,6 @@
>>> +#!/bin/sh
>>> +
>>> 
>>> +mtdparts="256k(nand0.at91bootstrap),512k(nand0.barebox)ro,256k(nand0.bareboxenv),256k(nand0.bareboxenv2),256k(nand0.spare),512k(nand0.oftree),6M(nand0.kernel),-(nand0.rootfs)"
>>> +kernelname="atmel_nand"
>>> +
>>> +mtdparts-add -b -d nand0 -k ${kernelname} -p ${mtdparts}
>> 
>> 
>> Using this type of partition table make the file system can not mount
>> successfully.
>> 
>> I remove the "nand0." for partition name, then it is OK. After this change,
>> it won't keep consistent with the partition table name.
>> 
>> Now boot up the barebox, the partition for nand is: "/dev/barebox",
>> "/dev/barebox.bb" while not "/dev/nand0.barebox", /dev/nand0.barebox.bb". I
>> am thinking would it be possible to keep the consistent?
>> 
>> 
>>> diff --git a/arch/arm/boards/sama5d4ek/env/init/ps1
>>> b/arch/arm/boards/sama5d4ek/env/init/ps1
>>> new file mode 100644
>>> index 0000000..c0ec1a5
>>> --- /dev/null
>>> +++ b/arch/arm/boards/sama5d4ek/env/init/ps1
>>> @@ -0,0 +1,7 @@
>>> +#!/bin/sh
>>> +
>>> +if [ ${global.allow_color} = "true" ]; then
>>> +       export PS1="\e[1;32mbarebox@\e[1;31m\h:\w\e[0m\n# "
>>> +else
>>> +        export PS1="barebox@\h:\w "
>>> +fi
>>> diff --git a/arch/arm/boards/sama5d4ek/env/init/splash
>>> b/arch/arm/boards/sama5d4ek/env/init/splash
>>> new file mode 100644
>>> index 0000000..190ef31
>>> --- /dev/null
>>> +++ b/arch/arm/boards/sama5d4ek/env/init/splash
>>> @@ -0,0 +1,10 @@
>>> +#!/bin/sh
>>> +
>>> +splash=/env/splash.png
>>> +
>>> +if [ -f ${splash} -a -e /dev/fb0 ]; then
>>> +       splash -o ${splash}
>>> +       fb0.enable=1
>>> +fi
>>> +
>>> +exit 1
>>> diff --git a/arch/arm/boards/sama5d4ek/env/nv/boot.default
>>> b/arch/arm/boards/sama5d4ek/env/nv/boot.default
>>> new file mode 100644
>>> index 0000000..d9dfbbc
>>> --- /dev/null
>>> +++ b/arch/arm/boards/sama5d4ek/env/nv/boot.default
>>> @@ -0,0 +1 @@
>>> +nand-ubi
>>> diff --git a/arch/arm/boards/sama5d4ek/env/nv/bootargs.base
>>> b/arch/arm/boards/sama5d4ek/env/nv/bootargs.base
>>> new file mode 100644
>>> index 0000000..476b1fb
>>> --- /dev/null
>>> +++ b/arch/arm/boards/sama5d4ek/env/nv/bootargs.base
>>> @@ -0,0 +1 @@
>>> +console=ttyS0,115200
>> 
>> 
>> Till now, I don't know the difference between "bootargs.base" (here maybe
>> linux.bootargs.base (?)) and "linux.bootargs.console"
>> 
>> 
>>> diff --git a/arch/arm/boards/sama5d4ek/env/nv/hostname
>>> b/arch/arm/boards/sama5d4ek/env/nv/hostname
>>> new file mode 100644
>>> index 0000000..b74056d
>>> --- /dev/null
>>> +++ b/arch/arm/boards/sama5d4ek/env/nv/hostname
>>> @@ -0,0 +1 @@
>>> +sama5d4ek
>>> diff --git a/arch/arm/boards/sama5d4ek/env/nv/linux.bootargs.console
>>> b/arch/arm/boards/sama5d4ek/env/nv/linux.bootargs.console
>>> new file mode 100644
>>> index 0000000..476b1fb
>>> --- /dev/null
>>> +++ b/arch/arm/boards/sama5d4ek/env/nv/linux.bootargs.console
>>> @@ -0,0 +1 @@
>>> +console=ttyS0,115200
>>> diff --git a/arch/arm/configs/sama5d4ek_defconfig
>>> b/arch/arm/configs/sama5d4ek_defconfig
>>> index bbf254a..f050fe4 100644
>>> --- a/arch/arm/configs/sama5d4ek_defconfig
>>> +++ b/arch/arm/configs/sama5d4ek_defconfig
>>> @@ -9,13 +9,12 @@ CONFIG_MALLOC_SIZE=0xA00000
>>>  CONFIG_EXPERIMENTAL=y
>>>  CONFIG_MALLOC_TLSF=y
>>>  CONFIG_PROMPT="A5D4EK:"
>>> -CONFIG_GLOB=y
>>>  CONFIG_PROMPT_HUSH_PS2="y"
>>>  CONFIG_HUSH_FANCY_PROMPT=y
>>>  CONFIG_CMDLINE_EDITING=y
>>>  CONFIG_AUTO_COMPLETE=y
>>>  CONFIG_CONSOLE_ACTIVATE_ALL=y
>>> -CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y
>>> +CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
>>>  CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/sama5d4ek/env"
>>>  CONFIG_DEBUG_INFO=y
>>>  # CONFIG_CMD_ARM_CPUINFO is not set
>>> @@ -35,6 +34,8 @@ CONFIG_CMD_PARTITION=y
>>>  CONFIG_CMD_EXPORT=y
>>>  CONFIG_CMD_LOADENV=y
>>>  CONFIG_CMD_PRINTENV=y
>>> +CONFIG_CMD_MAGICVAR=y
>>> +CONFIG_CMD_MAGICVAR_HELP=y
>>>  CONFIG_CMD_SAVEENV=y
>>>  CONFIG_CMD_FILETYPE=y
>>>  CONFIG_CMD_SLEEP=y
>>> diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
>>> index 9ee4f30..7207232 100644
>>> --- a/arch/arm/mach-at91/Kconfig
>>> +++ b/arch/arm/mach-at91/Kconfig
>>> @@ -489,6 +489,7 @@ choice
>>> 
>>>  config MACH_SAMA5D4EK
>>>        bool "Atmel SAMA5D4 Evaluation Kit"
>>> +       select HAVE_DEFAULT_ENVIRONMENT_NEW
>>>        help
>>>          Select this if you are using Atmel's SAMA5D4-EK Evaluation Kit.
>>> 
>>> 
>> 
>> Best Regards,
>> Bo Shen
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/2] SAMA5D4EK - Now mostly supports booting Android from NAND.

[Bo Shen]

Hi Doug,

On 02/11/2015 12:02 PM, Doug Brainard wrote:
> Sorry, this was more me not understanding "git send-email" the first

It's OK, won't worry.

> time and how to keep it only sending the latest commit.

We normally do it in steps
1. format patch
    $ git format-patch -s -n (n is the number of patch you plan to send, 
from top to bottom.)
2. check the patch
    $ ./scripts/checkpatch.pl <your patches>
3. send the patch
    $ git send-email --to=.. --cc=.. <patch files>

More details, please reference the documentation in kernel: 
https://www.kernel.org/doc/Documentation/SubmittingPatches

> Doug

Best Regards,
Bo Shen

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 2/2] Switched SAMA5D4EK development board to the newer environment method.

[Bo Shen]

Hi J,

On 02/11/2015 01:06 PM, Jean-Christophe PLAGNIOL-VILLARD wrote:
> Hi,
>
> 	as state before I use the atmel board for bootp everyday as the defaultenv-2 does not support
> 	this Nack until it’s fixed

Do you mean the defaultenv-2 doesn't support the bootp feature or do you 
mean let Doug to keep the default boot from net?

> 	I did send patch for this in the past but they did not hit the mainline

Can you point us this? Thanks.

> Best Regards,
> J.

Best Regards,
Bo Shen


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/2] SAMA5D4EK - Now mostly supports booting Android from NAND.

[Sascha Hauer]

On Wed, Feb 11, 2015 at 01:04:54PM +0800, Jean-Christophe PLAGNIOL-VILLARD wrote:
> Nack
> 
> I use those board everyday on nfs boot
> 
> the boot choice is user specific

This file is removed anyway in the next patch, so this patch shouldn't
exist at all.

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 2/2] Switched SAMA5D4EK development board to the newer environment method.

[Sascha Hauer]

On Wed, Feb 11, 2015 at 03:26:46PM +0800, Bo Shen wrote:
> Hi J,
> 
> On 02/11/2015 01:06 PM, Jean-Christophe PLAGNIOL-VILLARD wrote:
> >Hi,
> >
> >	as state before I use the atmel board for bootp everyday as the defaultenv-2 does not support
> >	this Nack until it’s fixed
> 
> Do you mean the defaultenv-2 doesn't support the bootp feature or do
> you mean let Doug to keep the default boot from net?
> 
> >	I did send patch for this in the past but they did not hit the mainline
> 
> Can you point us this? Thanks.

He meant this patch:

http://lists.infradead.org/pipermail/barebox/2012-September/thread.html#9304

Reading this discussion again I still have mostly the same opinion:
an /env/boot/* script should be simple, it should be adjustable.

We should resolve this now.

So Jean-Christophe, What you want is to boot your board with
informations provided by the dhcp server. Looking again at your patch
back then the following should do it:

/env/boot/bootp:

| #!/bin/sh
| 
| path="/mnt/tftp"
| 
| ifup eth0
| 
| # Set variables based on information provided by the dhcp request
| nfsroot="${global.dhcp.rootpath}"
| global.bootm.image="${path}/${global.dhcp.bootfile}"
| global.bootm.oftree="${path}/${global.dhcp.oftree_file}"
| 
| bootargs-ip
| global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,v3,tcp"

Since you reject changes to the default boot source for this board your
other issue seems to be that you want your board to execute this bootscript
without further adjusting the environment. This is something we cannot do.
The default bootsource can only ever fit your personal or someone elses
use. We cannot make everyone happy with the default boot source, so I
suggest you either control your board via some expect script (which
sucks, I know) or you just save your adjusted environment on your test
board.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 2/2] Switched SAMA5D4EK development board to the newer environment method.

[Sascha Hauer]

On Wed, Feb 11, 2015 at 10:34:32AM +0800, Bo Shen wrote:
> >diff --git a/arch/arm/boards/sama5d4ek/env/nv/bootargs.base b/arch/arm/boards/sama5d4ek/env/nv/bootargs.base
> >new file mode 100644
> >index 0000000..476b1fb
> >--- /dev/null
> >+++ b/arch/arm/boards/sama5d4ek/env/nv/bootargs.base
> >@@ -0,0 +1 @@
> >+console=ttyS0,115200
> 
> Till now, I don't know the difference between "bootargs.base" (here
> maybe linux.bootargs.base (?)) and "linux.bootargs.console"

bootargs.base is unused, this file should be removed.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 2/2] Switched SAMA5D4EK development board to the newer environment method.

[Jean-Christophe PLAGNIOL-VILLARD]

> On Feb 11, 2015, at 4:35 PM, Sascha Hauer <s.hauer@pengutronix.de> wrote:
> 
> On Wed, Feb 11, 2015 at 03:26:46PM +0800, Bo Shen wrote:
>> Hi J,
>> 
>> On 02/11/2015 01:06 PM, Jean-Christophe PLAGNIOL-VILLARD wrote:
>>> Hi,
>>> 
>>> 	as state before I use the atmel board for bootp everyday as the defaultenv-2 does not support
>>> 	this Nack until it’s fixed
>> 
>> Do you mean the defaultenv-2 doesn't support the bootp feature or do
>> you mean let Doug to keep the default boot from net?
>> 
>>> 	I did send patch for this in the past but they did not hit the mainline
>> 
>> Can you point us this? Thanks.
> 
> He meant this patch:
> 
> http://lists.infradead.org/pipermail/barebox/2012-September/thread.html#9304
> 
> Reading this discussion again I still have mostly the same opinion:
> an /env/boot/* script should be simple, it should be adjustable.
> 
> We should resolve this now.
> 
> So Jean-Christophe, What you want is to boot your board with
> informations provided by the dhcp server. Looking again at your patch
> back then the following should do it:
> 
> /env/boot/bootp:
> 
> | #!/bin/sh
> | 
> | path="/mnt/tftp"
> | 
> | ifup eth0
> | 
> | # Set variables based on information provided by the dhcp request
> | nfsroot="${global.dhcp.rootpath}"
> | global.bootm.image="${path}/${global.dhcp.bootfile}"
> | global.bootm.oftree="${path}/${global.dhcp.oftree_file}”

this is not possible unfortunately

As if you use symlink the nfs will not work
it was work on defaultenv as it’s use the nfs commande and not FS
The nfs command handle symlink;w

that why in my patch I had to mount the fs first then remount it if it’s a symlink

so today the defaultenv-2 break the bootp support


> | 
> | bootargs-ip
> | global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,v3,tcp"
> 
> Since you reject changes to the default boot source for this board your
> other issue seems to be that you want your board to execute this bootscript
> without further adjusting the environment. This is something we cannot do.
> The default bootsource can only ever fit your personal or someone elses
> use. We cannot make everyone happy with the default boot source, so I
> suggest you either control your board via some expect script (which
> sucks, I know) or you just save your adjusted environment on your test
> board.

When the defaultenv-2 will support bootp I’ll be the first to get rid of the old defaultenv
but today I have automatic test system that depends on it to test linux on at91 and others

Best Regards,
J.
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 2/2] Switched SAMA5D4EK development board to the newer environment method.

[Eric Bénard]

Hi Jean Christophe,

Le Wed, 11 Feb 2015 16:54:09 +0800,
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> a écrit :
> When the defaultenv-2 will support bootp I’ll be the first to get rid of the old defaultenv
> but today I have automatic test system that depends on it to test linux on at91 and others
> 
and why don't you have your custom environment for your use case
instead of forcing everyone to use your environment by default (which
is far from being a user friendly environment for the standard use case
which is booting on the internal flash) ?

Best regards,
Eric

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 2/2] Switched SAMA5D4EK development board to the newer environment method.

[Sascha Hauer]

On Wed, Feb 11, 2015 at 04:54:09PM +0800, Jean-Christophe PLAGNIOL-VILLARD wrote:
> 
> > On Feb 11, 2015, at 4:35 PM, Sascha Hauer <s.hauer@pengutronix.de> wrote:
> > 
> > On Wed, Feb 11, 2015 at 03:26:46PM +0800, Bo Shen wrote:
> >> Hi J,
> >> 
> >> On 02/11/2015 01:06 PM, Jean-Christophe PLAGNIOL-VILLARD wrote:
> >>> Hi,
> >>> 
> >>> 	as state before I use the atmel board for bootp everyday as the defaultenv-2 does not support
> >>> 	this Nack until it’s fixed
> >> 
> >> Do you mean the defaultenv-2 doesn't support the bootp feature or do
> >> you mean let Doug to keep the default boot from net?
> >> 
> >>> 	I did send patch for this in the past but they did not hit the mainline
> >> 
> >> Can you point us this? Thanks.
> > 
> > He meant this patch:
> > 
> > http://lists.infradead.org/pipermail/barebox/2012-September/thread.html#9304
> > 
> > Reading this discussion again I still have mostly the same opinion:
> > an /env/boot/* script should be simple, it should be adjustable.
> > 
> > We should resolve this now.
> > 
> > So Jean-Christophe, What you want is to boot your board with
> > informations provided by the dhcp server. Looking again at your patch
> > back then the following should do it:
> > 
> > /env/boot/bootp:
> > 
> > | #!/bin/sh
> > | 
> > | path="/mnt/tftp"
> > | 
> > | ifup eth0
> > | 
> > | # Set variables based on information provided by the dhcp request
> > | nfsroot="${global.dhcp.rootpath}"
> > | global.bootm.image="${path}/${global.dhcp.bootfile}"
> > | global.bootm.oftree="${path}/${global.dhcp.oftree_file}”
> 
> this is not possible unfortunately
> 
> As if you use symlink the nfs will not work
> it was work on defaultenv as it’s use the nfs commande and not FS
> The nfs command handle symlink;

Let me recap: On the host you have some directory exported as NFS. It
contains a link to some other position:

/export/somelink -> /some/other/file

Now if I mount /export on barebox 'somelink' points to /some/other/file,
a path that doesn't exist in barebox, some the file cannot be read. The
NFS command implementation now mounts '/some/other' from the NFS server
and reads 'file' from that location.

This is really a misfeature is something that we shouldn't support at
all.

Can't you just make your link a relative one inside the exported
directory? That works just fine and as expected.

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 2/2] Switched SAMA5D4EK development board to the newer environment method.

[Jean-Christophe PLAGNIOL-VILLARD]

> On Feb 11, 2015, at 5:19 PM, Sascha Hauer <s.hauer@pengutronix.de> wrote:
> 
> On Wed, Feb 11, 2015 at 04:54:09PM +0800, Jean-Christophe PLAGNIOL-VILLARD wrote:
>> 
>>> On Feb 11, 2015, at 4:35 PM, Sascha Hauer <s.hauer@pengutronix.de> wrote:
>>> 
>>> On Wed, Feb 11, 2015 at 03:26:46PM +0800, Bo Shen wrote:
>>>> Hi J,
>>>> 
>>>> On 02/11/2015 01:06 PM, Jean-Christophe PLAGNIOL-VILLARD wrote:
>>>>> Hi,
>>>>> 
>>>>> 	as state before I use the atmel board for bootp everyday as the defaultenv-2 does not support
>>>>> 	this Nack until it’s fixed
>>>> 
>>>> Do you mean the defaultenv-2 doesn't support the bootp feature or do
>>>> you mean let Doug to keep the default boot from net?
>>>> 
>>>>> 	I did send patch for this in the past but they did not hit the mainline
>>>> 
>>>> Can you point us this? Thanks.
>>> 
>>> He meant this patch:
>>> 
>>> http://lists.infradead.org/pipermail/barebox/2012-September/thread.html#9304
>>> 
>>> Reading this discussion again I still have mostly the same opinion:
>>> an /env/boot/* script should be simple, it should be adjustable.
>>> 
>>> We should resolve this now.
>>> 
>>> So Jean-Christophe, What you want is to boot your board with
>>> informations provided by the dhcp server. Looking again at your patch
>>> back then the following should do it:
>>> 
>>> /env/boot/bootp:
>>> 
>>> | #!/bin/sh
>>> | 
>>> | path="/mnt/tftp"
>>> | 
>>> | ifup eth0
>>> | 
>>> | # Set variables based on information provided by the dhcp request
>>> | nfsroot="${global.dhcp.rootpath}"
>>> | global.bootm.image="${path}/${global.dhcp.bootfile}"
>>> | global.bootm.oftree="${path}/${global.dhcp.oftree_file}”
>> 
>> this is not possible unfortunately
>> 
>> As if you use symlink the nfs will not work
>> it was work on defaultenv as it’s use the nfs commande and not FS
>> The nfs command handle symlink;
> 
> Let me recap: On the host you have some directory exported as NFS. It
> contains a link to some other position:
> 
> /export/somelink -> /some/other/file
> 
> Now if I mount /export on barebox 'somelink' points to /some/other/file,
> a path that doesn't exist in barebox, some the file cannot be read. The
> NFS command implementation now mounts '/some/other' from the NFS server
> and reads 'file' from that location.
> 
> This is really a misfeature is something that we shouldn't support at
> all.
> 
> Can't you just make your link a relative one inside the exported
> directory? That works just fine and as expected.

unfortunately no can’t do so why not just add my old patch that work in all case

Best Regards,
J.
> 
> Sascha
> 
> 
> -- 
> Pengutronix e.K.                           |                             |
> Industrial Linux Solutions                 | http://www.pengutronix.de/  |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 2/2] Switched SAMA5D4EK development board to the newer environment method.

[Sascha Hauer]

On Wed, Feb 11, 2015 at 08:03:08PM +0800, Jean-Christophe PLAGNIOL-VILLARD wrote:
> >> As if you use symlink the nfs will not work
> >> it was work on defaultenv as it’s use the nfs commande and not FS
> >> The nfs command handle symlink;
> > 
> > Let me recap: On the host you have some directory exported as NFS. It
> > contains a link to some other position:
> > 
> > /export/somelink -> /some/other/file
> > 
> > Now if I mount /export on barebox 'somelink' points to /some/other/file,
> > a path that doesn't exist in barebox, some the file cannot be read. The
> > NFS command implementation now mounts '/some/other' from the NFS server
> > and reads 'file' from that location.
> > 
> > This is really a misfeature is something that we shouldn't support at
> > all.
> > 
> > Can't you just make your link a relative one inside the exported
> > directory? That works just fine and as expected.
> 
> unfortunately no can’t do so why not just add my old patch that work in all case

Because symbolic links are to be interpreted on the client, not on the
server. You are depending on some misfeature that went into a 2004
U-Boot supposedly by accident.

Anyway, your patch back then proved that it's possible to do what you
want with defaultenv-2. It shouldn't be a problem to put this script you
created on your board. If you don't want to depend on the environment on
stored on the board you could also cherry-pick a patch which adjusts the
defaultenv to your needs before compiling barebox.

As said, there can be only one defaultenv per board and this won't match
everyones needs. I fail to see why this should be an exotic setup for
your personal testing needs.

We also do automated testing here and have to deal with the fact that
the boards defaultenvironment doesn't fit out needs for this.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 2/2] Switched SAMA5D4EK development board to the newer environment method.

[Doug Brainard]

Sascha,

Any idea why the old environment didn't need the "nand0.", but the new
one does for the partitions to be named correctly?

>> I remove the "nand0." for partition name, then it is OK. After this change, it won't keep consistent with the partition >> table name.

>> Now boot up the barebox, the partition for nand is: "/dev/barebox", "/dev/barebox.bb" while not "/dev/nand0.barebox", >> /dev/nand0.barebox.bb". I am thinking would it be possible to keep the consistent?

Like Bo, I would prefer to not have to call it out specifically in the
mtdparts-nand.

Thanks,

Doug

On Tue, Feb 10, 2015 at 7:34 PM, Bo Shen <voice.shen@atmel.com> wrote:
> Hi Doug Brainard,
>
>
> On 02/10/2015 10:28 PM, Doug Brainard wrote:
>>
>> ---
>>   arch/arm/boards/sama5d4ek/env/bin/init_board       | 15 --------
>>   arch/arm/boards/sama5d4ek/env/boot/nand-ubi        |  8 +++++
>>   arch/arm/boards/sama5d4ek/env/config               | 42
>> ----------------------
>>   arch/arm/boards/sama5d4ek/env/init/mtdparts-nand   |  6 ++++
>>   arch/arm/boards/sama5d4ek/env/init/ps1             |  7 ++++
>>   arch/arm/boards/sama5d4ek/env/init/splash          | 10 ++++++
>>   arch/arm/boards/sama5d4ek/env/nv/boot.default      |  1 +
>>   arch/arm/boards/sama5d4ek/env/nv/bootargs.base     |  1 +
>>   arch/arm/boards/sama5d4ek/env/nv/hostname          |  1 +
>>   .../boards/sama5d4ek/env/nv/linux.bootargs.console |  1 +
>>   arch/arm/configs/sama5d4ek_defconfig               |  5 +--
>>   arch/arm/mach-at91/Kconfig                         |  1 +
>>   12 files changed, 39 insertions(+), 59 deletions(-)
>>   delete mode 100644 arch/arm/boards/sama5d4ek/env/bin/init_board
>>   create mode 100644 arch/arm/boards/sama5d4ek/env/boot/nand-ubi
>>   delete mode 100644 arch/arm/boards/sama5d4ek/env/config
>>   create mode 100644 arch/arm/boards/sama5d4ek/env/init/mtdparts-nand
>>   create mode 100644 arch/arm/boards/sama5d4ek/env/init/ps1
>>   create mode 100644 arch/arm/boards/sama5d4ek/env/init/splash
>>   create mode 100644 arch/arm/boards/sama5d4ek/env/nv/boot.default
>>   create mode 100644 arch/arm/boards/sama5d4ek/env/nv/bootargs.base
>>   create mode 100644 arch/arm/boards/sama5d4ek/env/nv/hostname
>>   create mode 100644
>> arch/arm/boards/sama5d4ek/env/nv/linux.bootargs.console
>>
>> diff --git a/arch/arm/boards/sama5d4ek/env/bin/init_board
>> b/arch/arm/boards/sama5d4ek/env/bin/init_board
>> deleted file mode 100644
>> index f3d417e..0000000
>> --- a/arch/arm/boards/sama5d4ek/env/bin/init_board
>> +++ /dev/null
>> @@ -1,15 +0,0 @@
>> -#!/bin/sh
>> -
>> -PATH=/env/bin
>> -export PATH
>> -
>> -. /env/config
>> -
>> -splash=/env/splash.png
>> -
>> -if [ -f ${splash} -a -e /dev/fb0 ]; then
>> -       splash -o ${splash}
>> -       fb0.enable=1
>> -fi
>> -
>> -exit 1
>> diff --git a/arch/arm/boards/sama5d4ek/env/boot/nand-ubi
>> b/arch/arm/boards/sama5d4ek/env/boot/nand-ubi
>> new file mode 100644
>> index 0000000..e8d6bde
>> --- /dev/null
>> +++ b/arch/arm/boards/sama5d4ek/env/boot/nand-ubi
>> @@ -0,0 +1,8 @@
>> +#!/bin/sh
>> +
>> +global.bootm.image="/dev/nand0.kernel.bb"
>> +global.bootm.oftree="/dev/nand0.oftree.bb"
>> +
>> +bootargs-ip
>> +
>> +global.linux.bootargs.dyn.root="root=ubi0:nand0.rootfs
>> ubi.mtd=nand0.rootfs rootfstype=ubifs noinitrd"
>> diff --git a/arch/arm/boards/sama5d4ek/env/config
>> b/arch/arm/boards/sama5d4ek/env/config
>> deleted file mode 100644
>> index ee86c07..0000000
>> --- a/arch/arm/boards/sama5d4ek/env/config
>> +++ /dev/null
>> @@ -1,42 +0,0 @@
>> -#!/bin/sh
>> -
>> -# use 'dhcp' to do dhcp in barebox and in kernel
>> -# use 'none' if you want to skip kernel ip autoconfiguration
>> -ip=dhcp
>> -
>> -# or set your networking parameters here
>> -#eth0.ipaddr=a.b.c.d
>> -#eth0.netmask=a.b.c.d
>> -#eth0.gateway=a.b.c.d
>> -#eth0.serverip=a.b.c.d
>> -
>> -# can be either 'nfs', 'tftp', 'nor' or 'nand'
>> -kernel_loc=nand
>> -# can be either 'net', 'nor', 'nand' or 'initrd'
>> -rootfs_loc=nand
>> -# can be either 'nfs', 'tftp', 'nand' or empty
>> -oftree_loc=nand
>> -
>> -# can be either 'jffs2' or 'ubifs'
>> -rootfs_type=ubifs
>> -rootfsimage=root.$rootfs_type
>> -ubiroot=system
>> -
>> -# The image type of the kernel. Can be uimage, zimage, raw, or raw_lzo
>> -kernelimage=zImage
>> -#kernelimage=uImage
>> -#kernelimage=Image
>> -#kernelimage=Image.lzo
>> -
>> -nand_device=atmel_nand
>>
>> -nand_parts="256k(at91bootstrap),512k(barebox)ro,256k(bareboxenv),256k(bareboxenv2),256k(spare),512k(oftree),6M(kernel),8M(recovery),176M(system),304M(userdata),-(cache)"
>> -rootfs_mtdblock_nand=10
>> -
>>
>> -m25p80_parts="64k(bootstrap),384k(barebox),256k(bareboxenv),256k(bareboxenv2),128k(oftree),-(updater)"
>> -
>> -autoboot_timeout=3
>> -
>> -bootargs="console=ttyS0,115200 ubi.mtd=8 ubi.mtd=9 init=/init
>> androidboot.hardware=sama5-pda androidboot.lcd=wvga"
>> -
>> -# set a fancy prompt (if support is compiled in)
>> -PS1="\e[1;32mbarebox@\e[1;31m\h:\w\e[0m\n# "
>> diff --git a/arch/arm/boards/sama5d4ek/env/init/mtdparts-nand
>> b/arch/arm/boards/sama5d4ek/env/init/mtdparts-nand
>> new file mode 100644
>> index 0000000..f20a135
>> --- /dev/null
>> +++ b/arch/arm/boards/sama5d4ek/env/init/mtdparts-nand
>> @@ -0,0 +1,6 @@
>> +#!/bin/sh
>> +
>>
>> +mtdparts="256k(nand0.at91bootstrap),512k(nand0.barebox)ro,256k(nand0.bareboxenv),256k(nand0.bareboxenv2),256k(nand0.spare),512k(nand0.oftree),6M(nand0.kernel),-(nand0.rootfs)"
>> +kernelname="atmel_nand"
>> +
>> +mtdparts-add -b -d nand0 -k ${kernelname} -p ${mtdparts}
>
>
> Using this type of partition table make the file system can not mount
> successfully.
>
> I remove the "nand0." for partition name, then it is OK. After this change,
> it won't keep consistent with the partition table name.
>
> Now boot up the barebox, the partition for nand is: "/dev/barebox",
> "/dev/barebox.bb" while not "/dev/nand0.barebox", /dev/nand0.barebox.bb". I
> am thinking would it be possible to keep the consistent?
>
>
>> diff --git a/arch/arm/boards/sama5d4ek/env/init/ps1
>> b/arch/arm/boards/sama5d4ek/env/init/ps1
>> new file mode 100644
>> index 0000000..c0ec1a5
>> --- /dev/null
>> +++ b/arch/arm/boards/sama5d4ek/env/init/ps1
>> @@ -0,0 +1,7 @@
>> +#!/bin/sh
>> +
>> +if [ ${global.allow_color} = "true" ]; then
>> +       export PS1="\e[1;32mbarebox@\e[1;31m\h:\w\e[0m\n# "
>> +else
>> +        export PS1="barebox@\h:\w "
>> +fi
>> diff --git a/arch/arm/boards/sama5d4ek/env/init/splash
>> b/arch/arm/boards/sama5d4ek/env/init/splash
>> new file mode 100644
>> index 0000000..190ef31
>> --- /dev/null
>> +++ b/arch/arm/boards/sama5d4ek/env/init/splash
>> @@ -0,0 +1,10 @@
>> +#!/bin/sh
>> +
>> +splash=/env/splash.png
>> +
>> +if [ -f ${splash} -a -e /dev/fb0 ]; then
>> +       splash -o ${splash}
>> +       fb0.enable=1
>> +fi
>> +
>> +exit 1
>> diff --git a/arch/arm/boards/sama5d4ek/env/nv/boot.default
>> b/arch/arm/boards/sama5d4ek/env/nv/boot.default
>> new file mode 100644
>> index 0000000..d9dfbbc
>> --- /dev/null
>> +++ b/arch/arm/boards/sama5d4ek/env/nv/boot.default
>> @@ -0,0 +1 @@
>> +nand-ubi
>> diff --git a/arch/arm/boards/sama5d4ek/env/nv/bootargs.base
>> b/arch/arm/boards/sama5d4ek/env/nv/bootargs.base
>> new file mode 100644
>> index 0000000..476b1fb
>> --- /dev/null
>> +++ b/arch/arm/boards/sama5d4ek/env/nv/bootargs.base
>> @@ -0,0 +1 @@
>> +console=ttyS0,115200
>
>
> Till now, I don't know the difference between "bootargs.base" (here maybe
> linux.bootargs.base (?)) and "linux.bootargs.console"
>
>
>> diff --git a/arch/arm/boards/sama5d4ek/env/nv/hostname
>> b/arch/arm/boards/sama5d4ek/env/nv/hostname
>> new file mode 100644
>> index 0000000..b74056d
>> --- /dev/null
>> +++ b/arch/arm/boards/sama5d4ek/env/nv/hostname
>> @@ -0,0 +1 @@
>> +sama5d4ek
>> diff --git a/arch/arm/boards/sama5d4ek/env/nv/linux.bootargs.console
>> b/arch/arm/boards/sama5d4ek/env/nv/linux.bootargs.console
>> new file mode 100644
>> index 0000000..476b1fb
>> --- /dev/null
>> +++ b/arch/arm/boards/sama5d4ek/env/nv/linux.bootargs.console
>> @@ -0,0 +1 @@
>> +console=ttyS0,115200
>> diff --git a/arch/arm/configs/sama5d4ek_defconfig
>> b/arch/arm/configs/sama5d4ek_defconfig
>> index bbf254a..f050fe4 100644
>> --- a/arch/arm/configs/sama5d4ek_defconfig
>> +++ b/arch/arm/configs/sama5d4ek_defconfig
>> @@ -9,13 +9,12 @@ CONFIG_MALLOC_SIZE=0xA00000
>>   CONFIG_EXPERIMENTAL=y
>>   CONFIG_MALLOC_TLSF=y
>>   CONFIG_PROMPT="A5D4EK:"
>> -CONFIG_GLOB=y
>>   CONFIG_PROMPT_HUSH_PS2="y"
>>   CONFIG_HUSH_FANCY_PROMPT=y
>>   CONFIG_CMDLINE_EDITING=y
>>   CONFIG_AUTO_COMPLETE=y
>>   CONFIG_CONSOLE_ACTIVATE_ALL=y
>> -CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y
>> +CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
>>   CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/sama5d4ek/env"
>>   CONFIG_DEBUG_INFO=y
>>   # CONFIG_CMD_ARM_CPUINFO is not set
>> @@ -35,6 +34,8 @@ CONFIG_CMD_PARTITION=y
>>   CONFIG_CMD_EXPORT=y
>>   CONFIG_CMD_LOADENV=y
>>   CONFIG_CMD_PRINTENV=y
>> +CONFIG_CMD_MAGICVAR=y
>> +CONFIG_CMD_MAGICVAR_HELP=y
>>   CONFIG_CMD_SAVEENV=y
>>   CONFIG_CMD_FILETYPE=y
>>   CONFIG_CMD_SLEEP=y
>> diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
>> index 9ee4f30..7207232 100644
>> --- a/arch/arm/mach-at91/Kconfig
>> +++ b/arch/arm/mach-at91/Kconfig
>> @@ -489,6 +489,7 @@ choice
>>
>>   config MACH_SAMA5D4EK
>>         bool "Atmel SAMA5D4 Evaluation Kit"
>> +       select HAVE_DEFAULT_ENVIRONMENT_NEW
>>         help
>>           Select this if you are using Atmel's SAMA5D4-EK Evaluation Kit.
>>
>>
>
> Best Regards,
> Bo Shen

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 2/2] Switched SAMA5D4EK development board to the newer environment method.

[Doug Brainard]

Sascha,

>> bootargs.base is unused, this file should be removed.

My next patch attempt will have "bootargs.base" removed, and it will
attempt to boot from "nand" and then fall back to "net" if the nand is
not programmed.

Just waiting on clarification on the "nand0." question when you get in tomorrow.

Thanks,

Doug

On Wed, Feb 11, 2015 at 1:43 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote:
> On Wed, Feb 11, 2015 at 10:34:32AM +0800, Bo Shen wrote:
>> >diff --git a/arch/arm/boards/sama5d4ek/env/nv/bootargs.base b/arch/arm/boards/sama5d4ek/env/nv/bootargs.base
>> >new file mode 100644
>> >index 0000000..476b1fb
>> >--- /dev/null
>> >+++ b/arch/arm/boards/sama5d4ek/env/nv/bootargs.base
>> >@@ -0,0 +1 @@
>> >+console=ttyS0,115200
>>
>> Till now, I don't know the difference between "bootargs.base" (here
>> maybe linux.bootargs.base (?)) and "linux.bootargs.console"
>
> bootargs.base is unused, this file should be removed.
>
> Sascha
>
> --
> Pengutronix e.K.                           |                             |
> Industrial Linux Solutions                 | http://www.pengutronix.de/  |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 2/2] Switched SAMA5D4EK development board to the newer environment method.

[Doug Brainard]

So it looks like the following line in mtdparts-add is causing the
"nand0." issue:

addpart -n /dev/${device} "$parts" || exit

The old environment didn't use the "-n".  Removing the "-n" fixes the
issue and gives it the same functionality as the old environment did.

So the question is how should I fix this?  I could remove it in the
default environment, but that would require all other boards using the
new environment to update.

Or, I can add my own env/bin/mtdparts-add script for the board and
remove the "-n" from there instead which would leave the other
projects alone.  I'm assuming I should use this option as the fix, but
I wanted to confirm that with you.

Thanks,

Doug

On Wed, Feb 11, 2015 at 9:38 AM, Doug Brainard
<dbrainard@brainardinsight.com> wrote:
> Sascha,
>
> Any idea why the old environment didn't need the "nand0.", but the new
> one does for the partitions to be named correctly?
>
>>> I remove the "nand0." for partition name, then it is OK. After this change, it won't keep consistent with the partition >> table name.
>
>>> Now boot up the barebox, the partition for nand is: "/dev/barebox", "/dev/barebox.bb" while not "/dev/nand0.barebox", >> /dev/nand0.barebox.bb". I am thinking would it be possible to keep the consistent?
>
> Like Bo, I would prefer to not have to call it out specifically in the
> mtdparts-nand.
>
> Thanks,
>
> Doug
>
> On Tue, Feb 10, 2015 at 7:34 PM, Bo Shen <voice.shen@atmel.com> wrote:
>> Hi Doug Brainard,
>>
>>
>> On 02/10/2015 10:28 PM, Doug Brainard wrote:
>>>
>>> ---
>>>   arch/arm/boards/sama5d4ek/env/bin/init_board       | 15 --------
>>>   arch/arm/boards/sama5d4ek/env/boot/nand-ubi        |  8 +++++
>>>   arch/arm/boards/sama5d4ek/env/config               | 42
>>> ----------------------
>>>   arch/arm/boards/sama5d4ek/env/init/mtdparts-nand   |  6 ++++
>>>   arch/arm/boards/sama5d4ek/env/init/ps1             |  7 ++++
>>>   arch/arm/boards/sama5d4ek/env/init/splash          | 10 ++++++
>>>   arch/arm/boards/sama5d4ek/env/nv/boot.default      |  1 +
>>>   arch/arm/boards/sama5d4ek/env/nv/bootargs.base     |  1 +
>>>   arch/arm/boards/sama5d4ek/env/nv/hostname          |  1 +
>>>   .../boards/sama5d4ek/env/nv/linux.bootargs.console |  1 +
>>>   arch/arm/configs/sama5d4ek_defconfig               |  5 +--
>>>   arch/arm/mach-at91/Kconfig                         |  1 +
>>>   12 files changed, 39 insertions(+), 59 deletions(-)
>>>   delete mode 100644 arch/arm/boards/sama5d4ek/env/bin/init_board
>>>   create mode 100644 arch/arm/boards/sama5d4ek/env/boot/nand-ubi
>>>   delete mode 100644 arch/arm/boards/sama5d4ek/env/config
>>>   create mode 100644 arch/arm/boards/sama5d4ek/env/init/mtdparts-nand
>>>   create mode 100644 arch/arm/boards/sama5d4ek/env/init/ps1
>>>   create mode 100644 arch/arm/boards/sama5d4ek/env/init/splash
>>>   create mode 100644 arch/arm/boards/sama5d4ek/env/nv/boot.default
>>>   create mode 100644 arch/arm/boards/sama5d4ek/env/nv/bootargs.base
>>>   create mode 100644 arch/arm/boards/sama5d4ek/env/nv/hostname
>>>   create mode 100644
>>> arch/arm/boards/sama5d4ek/env/nv/linux.bootargs.console
>>>
>>> diff --git a/arch/arm/boards/sama5d4ek/env/bin/init_board
>>> b/arch/arm/boards/sama5d4ek/env/bin/init_board
>>> deleted file mode 100644
>>> index f3d417e..0000000
>>> --- a/arch/arm/boards/sama5d4ek/env/bin/init_board
>>> +++ /dev/null
>>> @@ -1,15 +0,0 @@
>>> -#!/bin/sh
>>> -
>>> -PATH=/env/bin
>>> -export PATH
>>> -
>>> -. /env/config
>>> -
>>> -splash=/env/splash.png
>>> -
>>> -if [ -f ${splash} -a -e /dev/fb0 ]; then
>>> -       splash -o ${splash}
>>> -       fb0.enable=1
>>> -fi
>>> -
>>> -exit 1
>>> diff --git a/arch/arm/boards/sama5d4ek/env/boot/nand-ubi
>>> b/arch/arm/boards/sama5d4ek/env/boot/nand-ubi
>>> new file mode 100644
>>> index 0000000..e8d6bde
>>> --- /dev/null
>>> +++ b/arch/arm/boards/sama5d4ek/env/boot/nand-ubi
>>> @@ -0,0 +1,8 @@
>>> +#!/bin/sh
>>> +
>>> +global.bootm.image="/dev/nand0.kernel.bb"
>>> +global.bootm.oftree="/dev/nand0.oftree.bb"
>>> +
>>> +bootargs-ip
>>> +
>>> +global.linux.bootargs.dyn.root="root=ubi0:nand0.rootfs
>>> ubi.mtd=nand0.rootfs rootfstype=ubifs noinitrd"
>>> diff --git a/arch/arm/boards/sama5d4ek/env/config
>>> b/arch/arm/boards/sama5d4ek/env/config
>>> deleted file mode 100644
>>> index ee86c07..0000000
>>> --- a/arch/arm/boards/sama5d4ek/env/config
>>> +++ /dev/null
>>> @@ -1,42 +0,0 @@
>>> -#!/bin/sh
>>> -
>>> -# use 'dhcp' to do dhcp in barebox and in kernel
>>> -# use 'none' if you want to skip kernel ip autoconfiguration
>>> -ip=dhcp
>>> -
>>> -# or set your networking parameters here
>>> -#eth0.ipaddr=a.b.c.d
>>> -#eth0.netmask=a.b.c.d
>>> -#eth0.gateway=a.b.c.d
>>> -#eth0.serverip=a.b.c.d
>>> -
>>> -# can be either 'nfs', 'tftp', 'nor' or 'nand'
>>> -kernel_loc=nand
>>> -# can be either 'net', 'nor', 'nand' or 'initrd'
>>> -rootfs_loc=nand
>>> -# can be either 'nfs', 'tftp', 'nand' or empty
>>> -oftree_loc=nand
>>> -
>>> -# can be either 'jffs2' or 'ubifs'
>>> -rootfs_type=ubifs
>>> -rootfsimage=root.$rootfs_type
>>> -ubiroot=system
>>> -
>>> -# The image type of the kernel. Can be uimage, zimage, raw, or raw_lzo
>>> -kernelimage=zImage
>>> -#kernelimage=uImage
>>> -#kernelimage=Image
>>> -#kernelimage=Image.lzo
>>> -
>>> -nand_device=atmel_nand
>>>
>>> -nand_parts="256k(at91bootstrap),512k(barebox)ro,256k(bareboxenv),256k(bareboxenv2),256k(spare),512k(oftree),6M(kernel),8M(recovery),176M(system),304M(userdata),-(cache)"
>>> -rootfs_mtdblock_nand=10
>>> -
>>>
>>> -m25p80_parts="64k(bootstrap),384k(barebox),256k(bareboxenv),256k(bareboxenv2),128k(oftree),-(updater)"
>>> -
>>> -autoboot_timeout=3
>>> -
>>> -bootargs="console=ttyS0,115200 ubi.mtd=8 ubi.mtd=9 init=/init
>>> androidboot.hardware=sama5-pda androidboot.lcd=wvga"
>>> -
>>> -# set a fancy prompt (if support is compiled in)
>>> -PS1="\e[1;32mbarebox@\e[1;31m\h:\w\e[0m\n# "
>>> diff --git a/arch/arm/boards/sama5d4ek/env/init/mtdparts-nand
>>> b/arch/arm/boards/sama5d4ek/env/init/mtdparts-nand
>>> new file mode 100644
>>> index 0000000..f20a135
>>> --- /dev/null
>>> +++ b/arch/arm/boards/sama5d4ek/env/init/mtdparts-nand
>>> @@ -0,0 +1,6 @@
>>> +#!/bin/sh
>>> +
>>>
>>> +mtdparts="256k(nand0.at91bootstrap),512k(nand0.barebox)ro,256k(nand0.bareboxenv),256k(nand0.bareboxenv2),256k(nand0.spare),512k(nand0.oftree),6M(nand0.kernel),-(nand0.rootfs)"
>>> +kernelname="atmel_nand"
>>> +
>>> +mtdparts-add -b -d nand0 -k ${kernelname} -p ${mtdparts}
>>
>>
>> Using this type of partition table make the file system can not mount
>> successfully.
>>
>> I remove the "nand0." for partition name, then it is OK. After this change,
>> it won't keep consistent with the partition table name.
>>
>> Now boot up the barebox, the partition for nand is: "/dev/barebox",
>> "/dev/barebox.bb" while not "/dev/nand0.barebox", /dev/nand0.barebox.bb". I
>> am thinking would it be possible to keep the consistent?
>>
>>
>>> diff --git a/arch/arm/boards/sama5d4ek/env/init/ps1
>>> b/arch/arm/boards/sama5d4ek/env/init/ps1
>>> new file mode 100644
>>> index 0000000..c0ec1a5
>>> --- /dev/null
>>> +++ b/arch/arm/boards/sama5d4ek/env/init/ps1
>>> @@ -0,0 +1,7 @@
>>> +#!/bin/sh
>>> +
>>> +if [ ${global.allow_color} = "true" ]; then
>>> +       export PS1="\e[1;32mbarebox@\e[1;31m\h:\w\e[0m\n# "
>>> +else
>>> +        export PS1="barebox@\h:\w "
>>> +fi
>>> diff --git a/arch/arm/boards/sama5d4ek/env/init/splash
>>> b/arch/arm/boards/sama5d4ek/env/init/splash
>>> new file mode 100644
>>> index 0000000..190ef31
>>> --- /dev/null
>>> +++ b/arch/arm/boards/sama5d4ek/env/init/splash
>>> @@ -0,0 +1,10 @@
>>> +#!/bin/sh
>>> +
>>> +splash=/env/splash.png
>>> +
>>> +if [ -f ${splash} -a -e /dev/fb0 ]; then
>>> +       splash -o ${splash}
>>> +       fb0.enable=1
>>> +fi
>>> +
>>> +exit 1
>>> diff --git a/arch/arm/boards/sama5d4ek/env/nv/boot.default
>>> b/arch/arm/boards/sama5d4ek/env/nv/boot.default
>>> new file mode 100644
>>> index 0000000..d9dfbbc
>>> --- /dev/null
>>> +++ b/arch/arm/boards/sama5d4ek/env/nv/boot.default
>>> @@ -0,0 +1 @@
>>> +nand-ubi
>>> diff --git a/arch/arm/boards/sama5d4ek/env/nv/bootargs.base
>>> b/arch/arm/boards/sama5d4ek/env/nv/bootargs.base
>>> new file mode 100644
>>> index 0000000..476b1fb
>>> --- /dev/null
>>> +++ b/arch/arm/boards/sama5d4ek/env/nv/bootargs.base
>>> @@ -0,0 +1 @@
>>> +console=ttyS0,115200
>>
>>
>> Till now, I don't know the difference between "bootargs.base" (here maybe
>> linux.bootargs.base (?)) and "linux.bootargs.console"
>>
>>
>>> diff --git a/arch/arm/boards/sama5d4ek/env/nv/hostname
>>> b/arch/arm/boards/sama5d4ek/env/nv/hostname
>>> new file mode 100644
>>> index 0000000..b74056d
>>> --- /dev/null
>>> +++ b/arch/arm/boards/sama5d4ek/env/nv/hostname
>>> @@ -0,0 +1 @@
>>> +sama5d4ek
>>> diff --git a/arch/arm/boards/sama5d4ek/env/nv/linux.bootargs.console
>>> b/arch/arm/boards/sama5d4ek/env/nv/linux.bootargs.console
>>> new file mode 100644
>>> index 0000000..476b1fb
>>> --- /dev/null
>>> +++ b/arch/arm/boards/sama5d4ek/env/nv/linux.bootargs.console
>>> @@ -0,0 +1 @@
>>> +console=ttyS0,115200
>>> diff --git a/arch/arm/configs/sama5d4ek_defconfig
>>> b/arch/arm/configs/sama5d4ek_defconfig
>>> index bbf254a..f050fe4 100644
>>> --- a/arch/arm/configs/sama5d4ek_defconfig
>>> +++ b/arch/arm/configs/sama5d4ek_defconfig
>>> @@ -9,13 +9,12 @@ CONFIG_MALLOC_SIZE=0xA00000
>>>   CONFIG_EXPERIMENTAL=y
>>>   CONFIG_MALLOC_TLSF=y
>>>   CONFIG_PROMPT="A5D4EK:"
>>> -CONFIG_GLOB=y
>>>   CONFIG_PROMPT_HUSH_PS2="y"
>>>   CONFIG_HUSH_FANCY_PROMPT=y
>>>   CONFIG_CMDLINE_EDITING=y
>>>   CONFIG_AUTO_COMPLETE=y
>>>   CONFIG_CONSOLE_ACTIVATE_ALL=y
>>> -CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y
>>> +CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
>>>   CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/sama5d4ek/env"
>>>   CONFIG_DEBUG_INFO=y
>>>   # CONFIG_CMD_ARM_CPUINFO is not set
>>> @@ -35,6 +34,8 @@ CONFIG_CMD_PARTITION=y
>>>   CONFIG_CMD_EXPORT=y
>>>   CONFIG_CMD_LOADENV=y
>>>   CONFIG_CMD_PRINTENV=y
>>> +CONFIG_CMD_MAGICVAR=y
>>> +CONFIG_CMD_MAGICVAR_HELP=y
>>>   CONFIG_CMD_SAVEENV=y
>>>   CONFIG_CMD_FILETYPE=y
>>>   CONFIG_CMD_SLEEP=y
>>> diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
>>> index 9ee4f30..7207232 100644
>>> --- a/arch/arm/mach-at91/Kconfig
>>> +++ b/arch/arm/mach-at91/Kconfig
>>> @@ -489,6 +489,7 @@ choice
>>>
>>>   config MACH_SAMA5D4EK
>>>         bool "Atmel SAMA5D4 Evaluation Kit"
>>> +       select HAVE_DEFAULT_ENVIRONMENT_NEW
>>>         help
>>>           Select this if you are using Atmel's SAMA5D4-EK Evaluation Kit.
>>>
>>>
>>
>> Best Regards,
>> Bo Shen

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 2/2] Switched SAMA5D4EK development board to the newer environment method.

[Sascha Hauer]

On Wed, Feb 11, 2015 at 10:39:52AM -0700, Doug Brainard wrote:
> So it looks like the following line in mtdparts-add is causing the
> "nand0." issue:
> 
> addpart -n /dev/${device} "$parts" || exit
> 
> The old environment didn't use the "-n".  Removing the "-n" fixes the
> issue and gives it the same functionality as the old environment did.
> 
> So the question is how should I fix this?  I could remove it in the
> default environment, but that would require all other boards using the
> new environment to update.
> 
> Or, I can add my own env/bin/mtdparts-add script for the board and
> remove the "-n" from there instead which would leave the other
> projects alone.  I'm assuming I should use this option as the fix, but
> I wanted to confirm that with you.

I would rather add a '-n' option to the mtdparts-add script. Anyway, I
just sent a series updating the partition handling. Among other things
I hope that this fixes the naming issue.

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 2/2] Switched SAMA5D4EK development board to the newer environment method.

[Doug Brainard]

Okay, looking at some the patches you sent, I think it will resolve
the issue.  I'm still too new to this git patch concept to be sure how
to grab it to try it out, so I'll just wait until it gets committed
and then modify my changes to work well with it.

If it's a quick command I need to call, let me know and I'll try out the patch.

Thanks,

Doug

On Thu, Feb 12, 2015 at 2:13 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote:
> On Wed, Feb 11, 2015 at 10:39:52AM -0700, Doug Brainard wrote:
>> So it looks like the following line in mtdparts-add is causing the
>> "nand0." issue:
>>
>> addpart -n /dev/${device} "$parts" || exit
>>
>> The old environment didn't use the "-n".  Removing the "-n" fixes the
>> issue and gives it the same functionality as the old environment did.
>>
>> So the question is how should I fix this?  I could remove it in the
>> default environment, but that would require all other boards using the
>> new environment to update.
>>
>> Or, I can add my own env/bin/mtdparts-add script for the board and
>> remove the "-n" from there instead which would leave the other
>> projects alone.  I'm assuming I should use this option as the fix, but
>> I wanted to confirm that with you.
>
> I would rather add a '-n' option to the mtdparts-add script. Anyway, I
> just sent a series updating the partition handling. Among other things
> I hope that this fixes the naming issue.
>
> Sascha
>
>
> --
> Pengutronix e.K.                           |                             |
> Industrial Linux Solutions                 | http://www.pengutronix.de/  |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 2/2] Switched SAMA5D4EK development board to the newer environment method.

[Doug Brainard]

Sascha,

I got the patching thing figured out and they seem to be working well
for me.  I sent out a patch for the SAMA5D4EK new environment
requiring the patches you sent (fixing the naming issue).

Thanks,

Doug


On Thu, Feb 12, 2015 at 2:13 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote:
> On Wed, Feb 11, 2015 at 10:39:52AM -0700, Doug Brainard wrote:
>> So it looks like the following line in mtdparts-add is causing the
>> "nand0." issue:
>>
>> addpart -n /dev/${device} "$parts" || exit
>>
>> The old environment didn't use the "-n".  Removing the "-n" fixes the
>> issue and gives it the same functionality as the old environment did.
>>
>> So the question is how should I fix this?  I could remove it in the
>> default environment, but that would require all other boards using the
>> new environment to update.
>>
>> Or, I can add my own env/bin/mtdparts-add script for the board and
>> remove the "-n" from there instead which would leave the other
>> projects alone.  I'm assuming I should use this option as the fix, but
>> I wanted to confirm that with you.
>
> I would rather add a '-n' option to the mtdparts-add script. Anyway, I
> just sent a series updating the partition handling. Among other things
> I hope that this fixes the naming issue.
>
> Sascha
>
>
> --
> Pengutronix e.K.                           |                             |
> Industrial Linux Solutions                 | http://www.pengutronix.de/  |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox