* [u-boot-fslc][PATCH 1/2] Revert "Revert conversion for config_distro_bootcmd.h"
@ 2016-10-17 19:16 Fabio Berton
2016-10-17 19:16 ` [u-boot-fslc][PATCH 2/2] configs: wandboard: Set fdt based on board_rev and board_name Fabio Berton
2016-10-17 19:22 ` [u-boot-fslc][PATCH 1/2] Revert "Revert conversion for config_distro_bootcmd.h" Fabio Estevam
0 siblings, 2 replies; 5+ messages in thread
From: Fabio Berton @ 2016-10-17 19:16 UTC (permalink / raw)
To: meta-freescale
This reverts commit 6ed7ce72c7945ae972ebf0adb47c2b58c377b3cf.
Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Conflicts:
include/configs/wandboard.h
---
include/configs/mx6cuboxi.h | 88 +++++++++++++--------------------------------
include/configs/wandboard.h | 80 ++++++++++-------------------------------
2 files changed, 43 insertions(+), 125 deletions(-)
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index a605d8c..366b5b9 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -8,6 +8,7 @@
#ifndef __MX6CUBOXI_CONFIG_H
#define __MX6CUBOXI_CONFIG_H
+#include <config_distro_defaults.h>
#include "mx6_common.h"
#define CONFIG_SPL_LIBCOMMON_SUPPORT
@@ -76,23 +77,26 @@
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CONFIG_CONSOLE_DEV "ttymxc0"
-#define CONFIG_MMCROOT "/dev/mmcblk0p2"
#define CONFIG_SYS_FSL_USDHC_NUM 1
#define CONFIG_SYS_MMC_ENV_DEV 0 /* SDHC2 */
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
+#ifndef CONFIG_SPL_BUILD
#define CONFIG_EXTRA_ENV_SETTINGS \
- "script=boot.scr\0" \
- "image=zImage\0" \
"fdtfile=undefined\0" \
"fdt_addr_r=0x18000000\0" \
- "boot_fdt=try\0" \
+ "fdt_addr=0x18000000\0" \
+ "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+ "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+ "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
+ "ramdisk_addr_r=0x13000000\0" \
+ "ramdiskaddr=0x13000000\0" \
+ "initrd_high=0xffffffff\0" \
+ "fdt_high=0xffffffff\0" \
"ip_dyn=yes\0" \
"console=" CONFIG_CONSOLE_DEV "\0" \
"bootm_size=0x10000000\0" \
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
- "mmcpart=1\0" \
- "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
"update_sd_firmware=" \
"if test ${ip_dyn} = yes; then " \
"setenv get_cmd dhcp; " \
@@ -106,53 +110,6 @@
"mmc write ${loadaddr} 0x2 ${fw_sz}; " \
"fi; " \
"fi\0" \
- "mmcargs=setenv bootargs console=${console},${baudrate} " \
- "root=${mmcroot}\0" \
- "loadbootscript=" \
- "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
- "bootscript=echo Running bootscript from mmc ...; " \
- "source\0" \
- "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} ${fdtfile}\0" \
- "mmcboot=echo Booting from mmc ...; " \
- "run mmcargs; " \
- "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
- "if run loadfdt; then " \
- "bootz ${loadaddr} - ${fdt_addr_r}; " \
- "else " \
- "if test ${boot_fdt} = try; then " \
- "bootz; " \
- "else " \
- "echo WARN: Cannot load the DT; " \
- "fi; " \
- "fi; " \
- "else " \
- "bootz; " \
- "fi;\0" \
- "netargs=setenv bootargs console=${console},${baudrate} " \
- "root=/dev/nfs " \
- "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
- "netboot=echo Booting from net ...; " \
- "run netargs; " \
- "if test ${ip_dyn} = yes; then " \
- "setenv get_cmd dhcp; " \
- "else " \
- "setenv get_cmd tftp; " \
- "fi; " \
- "${get_cmd} ${image}; " \
- "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
- "if ${get_cmd} ${fdt_addr_r} ${fdtfile}; then " \
- "bootz ${loadaddr} - ${fdt_addr_r}; " \
- "else " \
- "if test ${boot_fdt} = try; then " \
- "bootz; " \
- "else " \
- "echo WARN: Cannot load the DT; " \
- "fi; " \
- "fi; " \
- "else " \
- "bootz; " \
- "fi;\0" \
"findfdt="\
"if test $board_name = HUMMINGBOARD && test $board_rev = MX6Q ; then " \
"setenv fdtfile imx6q-hummingboard.dtb; fi; " \
@@ -164,20 +121,23 @@
"setenv fdtfile imx6dl-cubox-i.dtb; fi; " \
"if test $fdtfile = undefined; then " \
"echo WARNING: Could not determine dtb to use; fi; \0" \
+ BOOTENV
#define CONFIG_BOOTCOMMAND \
"run findfdt; " \
- "mmc dev ${mmcdev};" \
- "if mmc rescan; then " \
- "if run loadbootscript; then " \
- "run bootscript; " \
- "else " \
- "if run loadimage; then " \
- "run mmcboot; " \
- "else run netboot; " \
- "fi; " \
- "fi; " \
- "else run netboot; fi"
+ "run distro_bootcmd"
+
+#define BOOT_TARGET_DEVICES(func) \
+ func(MMC, mmc, 0) \
+ func(USB, usb, 0) \
+ func(PXE, pxe, na) \
+ func(DHCP, dhcp, na)
+
+#include <config_distro_bootcmd.h>
+
+#else
+#define CONFIG_EXTRA_ENV_SETTINGS
+#endif /* CONFIG_SPL_BUILD */
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 55aa3b5..29b4be3 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -9,6 +9,7 @@
#ifndef __CONFIG_H
#define __CONFIG_H
+#include <config_distro_defaults.h>
#include "mx6_common.h"
#define CONFIG_SPL_LIBCOMMON_SUPPORT
@@ -94,15 +95,13 @@
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
#define CONFIG_EXTRA_ENV_SETTINGS \
- "script=boot.scr\0" \
- "image=zImage\0" \
- "console=ttymxc0\0" \
+ "console=ttymxc0,115200\0" \
"splashpos=m,m\0" \
"fdtfile=undefined\0" \
"fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \
+ "fdt_addr_r=0x18000000\0" \
"fdt_addr=0x18000000\0" \
- "boot_fdt=try\0" \
"ip_dyn=yes\0" \
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
"mmcpart=1\0" \
@@ -121,8 +120,6 @@
"mmc write ${loadaddr} 0x2 ${fw_sz}; " \
"fi; " \
"fi\0" \
- "mmcargs=setenv bootargs console=${console},${baudrate} " \
- "root=${mmcroot}; run videoargs\0" \
"videoargs=" \
"setenv nextcon 0; " \
"if hdmidet; then " \
@@ -149,51 +146,6 @@
"echo '- no FWBADAPT-7WVGA-LCD-F07A-0102 display';" \
"fi; " \
"setenv bootargs ${bootargs} ${fbmem}\0" \
- "loadbootscript=" \
- "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
- "bootscript=echo Running bootscript from mmc ...; " \
- "source\0" \
- "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \
- "mmcboot=echo Booting from mmc ...; " \
- "run mmcargs; " \
- "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
- "if run loadfdt; then " \
- "bootz ${loadaddr} - ${fdt_addr}; " \
- "else " \
- "if test ${boot_fdt} = try; then " \
- "bootz; " \
- "else " \
- "echo WARN: Cannot load the DT; " \
- "fi; " \
- "fi; " \
- "else " \
- "bootz; " \
- "fi;\0" \
- "netargs=setenv bootargs console=${console},${baudrate} " \
- "root=/dev/nfs " \
- "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
- "netboot=echo Booting from net ...; " \
- "run netargs; " \
- "if test ${ip_dyn} = yes; then " \
- "setenv get_cmd dhcp; " \
- "else " \
- "setenv get_cmd tftp; " \
- "fi; " \
- "${get_cmd} ${image}; " \
- "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
- "if ${get_cmd} ${fdt_addr} ${fdtfile}; then " \
- "bootz ${loadaddr} - ${fdt_addr}; " \
- "else " \
- "if test ${boot_fdt} = try; then " \
- "bootz; " \
- "else " \
- "echo WARN: Cannot load the DT; " \
- "fi; " \
- "fi; " \
- "else " \
- "bootz; " \
- "fi;\0" \
"findfdt="\
"if test $board_rev = MX6Q ; then " \
"setenv fdtfile imx6q-wandboard.dtb; fi; " \
@@ -201,19 +153,25 @@
"setenv fdtfile imx6dl-wandboard.dtb; fi; " \
"if test $fdtfile = undefined; then " \
"echo WARNING: Could not determine dtb to use; fi; \0" \
+ "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+ "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+ "ramdisk_addr_r=0x13000000\0" \
+ "ramdiskaddr=0x13000000\0" \
+ "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
+ BOOTENV
+
+#define BOOT_TARGET_DEVICES(func) \
+ func(MMC, mmc, 0) \
+ func(MMC, mmc, 1) \
+ func(USB, usb, 0) \
+ func(PXE, pxe, na) \
+ func(DHCP, dhcp, na)
#define CONFIG_BOOTCOMMAND \
"run findfdt; " \
- "mmc dev ${mmcdev}; if mmc rescan; then " \
- "if run loadbootscript; then " \
- "run bootscript; " \
- "else " \
- "if run loadimage; then " \
- "run mmcboot; " \
- "else run netboot; " \
- "fi; " \
- "fi; " \
- "else run netboot; fi"
+ "run distro_bootcmd"
+
+#include <config_distro_bootcmd.h>
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1
--
2.1.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [u-boot-fslc][PATCH 2/2] configs: wandboard: Set fdt based on board_rev and board_name
2016-10-17 19:16 [u-boot-fslc][PATCH 1/2] Revert "Revert conversion for config_distro_bootcmd.h" Fabio Berton
@ 2016-10-17 19:16 ` Fabio Berton
2016-10-17 19:22 ` [u-boot-fslc][PATCH 1/2] Revert "Revert conversion for config_distro_bootcmd.h" Fabio Estevam
1 sibling, 0 replies; 5+ messages in thread
From: Fabio Berton @ 2016-10-17 19:16 UTC (permalink / raw)
To: meta-freescale
New kernel linux-wandboard version 4.1.15_1.1.0_ga changed device tree
name adding board revision on file name. The new names are:
- imx6dl-wandboard-revb1
- imx6dl-wandboard-revc1
- imx6q-wandboard-revb1
- imx6q-wandboard-revc1
Add condition to set correct fdt name based on board_rev and board_name.
Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
---
include/configs/wandboard.h | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 29b4be3..801be39 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -147,10 +147,14 @@
"fi; " \
"setenv bootargs ${bootargs} ${fbmem}\0" \
"findfdt="\
- "if test $board_rev = MX6Q ; then " \
- "setenv fdtfile imx6q-wandboard.dtb; fi; " \
- "if test $board_rev = MX6DL ; then " \
- "setenv fdtfile imx6dl-wandboard.dtb; fi; " \
+ "if test $board_rev = MX6Q && test $board_name = B1 ; then " \
+ "setenv fdtfile imx6q-wandboard-revb1.dtb; fi; " \
+ "if test $board_rev = MX6Q && test $board_name = C1 ; then " \
+ "setenv fdtfile imx6q-wandboard-revc1.dtb; fi; " \
+ "if test $board_rev = MX6DL && test $board_name = B1; then " \
+ "setenv fdtfile imx6dl-wandboard-revb1.dtb; fi; " \
+ "if test $board_rev = MX6DL && test $board_name = C1; then " \
+ "setenv fdtfile imx6dl-wandboard-revc1.dtb; fi; " \
"if test $fdtfile = undefined; then " \
"echo WARNING: Could not determine dtb to use; fi; \0" \
"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
--
2.1.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [u-boot-fslc][PATCH 1/2] Revert "Revert conversion for config_distro_bootcmd.h"
2016-10-17 19:16 [u-boot-fslc][PATCH 1/2] Revert "Revert conversion for config_distro_bootcmd.h" Fabio Berton
2016-10-17 19:16 ` [u-boot-fslc][PATCH 2/2] configs: wandboard: Set fdt based on board_rev and board_name Fabio Berton
@ 2016-10-17 19:22 ` Fabio Estevam
2016-10-17 19:29 ` Fabio Berton
1 sibling, 1 reply; 5+ messages in thread
From: Fabio Estevam @ 2016-10-17 19:22 UTC (permalink / raw)
To: Fabio Berton; +Cc: meta-freescale
On Mon, Oct 17, 2016 at 5:16 PM, Fabio Berton
<fabio.berton@ossystems.com.br> wrote:
> This reverts commit 6ed7ce72c7945ae972ebf0adb47c2b58c377b3cf.
Why not add distro config support instead?
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [u-boot-fslc][PATCH 1/2] Revert "Revert conversion for config_distro_bootcmd.h"
2016-10-17 19:22 ` [u-boot-fslc][PATCH 1/2] Revert "Revert conversion for config_distro_bootcmd.h" Fabio Estevam
@ 2016-10-17 19:29 ` Fabio Berton
2016-10-17 19:32 ` Fabio Estevam
0 siblings, 1 reply; 5+ messages in thread
From: Fabio Berton @ 2016-10-17 19:29 UTC (permalink / raw)
To: Fabio Estevam; +Cc: meta-freescale
[-- Attachment #1: Type: text/plain, Size: 396 bytes --]
We're adding back this. Look at patches that I sent to meta-fsl-arm-extra
that add support to extlinux.
On Mon, Oct 17, 2016 at 5:22 PM, Fabio Estevam <festevam@gmail.com> wrote:
> On Mon, Oct 17, 2016 at 5:16 PM, Fabio Berton
> <fabio.berton@ossystems.com.br> wrote:
> > This reverts commit 6ed7ce72c7945ae972ebf0adb47c2b58c377b3cf.
>
> Why not add distro config support instead?
>
[-- Attachment #2: Type: text/html, Size: 859 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [u-boot-fslc][PATCH 1/2] Revert "Revert conversion for config_distro_bootcmd.h"
2016-10-17 19:29 ` Fabio Berton
@ 2016-10-17 19:32 ` Fabio Estevam
0 siblings, 0 replies; 5+ messages in thread
From: Fabio Estevam @ 2016-10-17 19:32 UTC (permalink / raw)
To: Fabio Berton; +Cc: meta-freescale
On Mon, Oct 17, 2016 at 5:29 PM, Fabio Berton
<fabio.berton@ossystems.com.br> wrote:
> We're adding back this. Look at patches that I sent to meta-fsl-arm-extra
> that add support to extlinux.
Then why are you reverting this then?
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-10-17 19:32 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-17 19:16 [u-boot-fslc][PATCH 1/2] Revert "Revert conversion for config_distro_bootcmd.h" Fabio Berton
2016-10-17 19:16 ` [u-boot-fslc][PATCH 2/2] configs: wandboard: Set fdt based on board_rev and board_name Fabio Berton
2016-10-17 19:22 ` [u-boot-fslc][PATCH 1/2] Revert "Revert conversion for config_distro_bootcmd.h" Fabio Estevam
2016-10-17 19:29 ` Fabio Berton
2016-10-17 19:32 ` Fabio Estevam
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.