[U-Boot] [PATCH 0/6] mx6: tqma6: small config and env fixes
From: Markus Niebel Markus.Niebel@tq-group.com
Markus Niebel (6): arm: imx6: tqma6: add configurable CMA size imx6: tqma6: rely on default setting for tftp and nfs mx6: tqma6: fix typo in env mx6: tqma6: add rootfsmode environment for mmc / sd tqma6: fix rounding in env tqma6: [cosmetic] sanitize environment defines
include/configs/tqma6.h | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-)
From: Markus Niebel Markus.Niebel@tq-group.com
depending on the use case different CMA sizes are needed for linux. Add env var to enable passing CMA size via kernel command line
Signed-off-by: Markus Niebel Markus.Niebel@tq-group.com --- include/configs/tqma6.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 09783a2..ceb4626 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -281,6 +281,9 @@ /* 128 MiB offset as in ARM related docu for linux suggested */ #define TQMA6_FDT_ADDRESS 0x18000000
+/* set to a resonable value, changeable by user */ +#define TQMA6_CMA_SIZE 160M + #define CONFIG_EXTRA_ENV_SETTINGS \ "board=tqma6\0" \ "uimage=uImage\0" \ @@ -293,14 +296,16 @@ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ "fdt_addr="__stringify(TQMA6_FDT_ADDRESS)"\0" \ "console=" CONSOLE_DEV "\0" \ + "cma_size="__stringify(TQMA6_CMA_SIZE)"\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ + "addcma=setenv bootargs ${bootargs} cma=${cma_size}\0" \ "addtty=setenv bootargs ${bootargs} console=${console},${baudrate}\0" \ "addfb=setenv bootargs ${bootargs} " \ "imx-fbdev.legacyfb_depth=32 consoleblank=0\0" \ "mmcpart=2\0" \ "mmcblkdev=0\0" \ - "mmcargs=run addmmc addtty addfb\0" \ + "mmcargs=run addmmc addtty addfb addcma\0" \ "addmmc=setenv bootargs ${bootargs} " \ "root=/dev/mmcblk${mmcblkdev}p${mmcpart} rw rootwait\0" \ "mmcboot=echo Booting from mmc ...; " \ @@ -317,7 +322,7 @@ "netdev=eth0\0" \ "rootpath=/srv/nfs/tqma6\0" \ "ipmode=static\0" \ - "netargs=run addnfs addip addtty addfb\0" \ + "netargs=run addnfs addip addtty addfb addcma\0" \ "addnfs=setenv bootargs ${bootargs} " \ "root=/dev/nfs rw " \ "nfsroot=${serverip}:${rootpath},v3,tcp;\0" \
From: Markus Niebel Markus.Niebel@tq-group.com
Playing with USB-to-Ethernet dongles it turns out, that these will not work with special settings
Signed-off-by: Markus Niebel Markus.Niebel@tq-group.com --- include/configs/tqma6.h | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index ceb4626..dce9c25 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -93,10 +93,6 @@ #define CONFIG_MII
#define CONFIG_ARP_TIMEOUT 200UL -/* Network config - Allow larger/faster download for TFTP/NFS */ -#define CONFIG_IP_DEFRAG -#define CONFIG_TFTP_BLOCKSIZE 4096 -#define CONFIG_NFS_READ_SIZE 4096
/* Command definition */ #define CONFIG_CMD_BMODE
From: Markus Niebel Markus.Niebel@tq-group.com
there was a double bracketed var ref. fix this.
Signed-off-by: Markus Niebel Markus.Niebel@tq-group.com --- include/configs/tqma6.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index dce9c25..874b44b 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -262,7 +262,7 @@ __stringify(TQMA6_SPI_FLASH_SECTOR_SIZE)"; " \ "setexpr offset ${fdt_start} * " \ __stringify(TQMA6_SPI_FLASH_SECTOR_SIZE)"; " \ - "sf read ${${fdt_addr}} ${offset} ${size}; " \ + "sf read ${fdt_addr} ${offset} ${size}; " \ "setenv size ; setenv offset\0" \
#define CONFIG_BOOTCOMMAND \
From: Markus Niebel Markus.Niebel@tq-group.com
Signed-off-by: Markus Niebel Markus.Niebel@tq-group.com --- include/configs/tqma6.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 874b44b..311221d 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -295,6 +295,7 @@ "cma_size="__stringify(TQMA6_CMA_SIZE)"\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ + "rootfsmode=ro\0" \ "addcma=setenv bootargs ${bootargs} cma=${cma_size}\0" \ "addtty=setenv bootargs ${bootargs} console=${console},${baudrate}\0" \ "addfb=setenv bootargs ${bootargs} " \ @@ -303,7 +304,8 @@ "mmcblkdev=0\0" \ "mmcargs=run addmmc addtty addfb addcma\0" \ "addmmc=setenv bootargs ${bootargs} " \ - "root=/dev/mmcblk${mmcblkdev}p${mmcpart} rw rootwait\0" \ + "root=/dev/mmcblk${mmcblkdev}p${mmcpart} ${rootfsmode} " \ + "rootwait\0" \ "mmcboot=echo Booting from mmc ...; " \ "setenv bootargs; " \ "run mmcargs; " \
From: Markus Niebel Markus.Niebel@tq-group.com
need to add before div in mmc update scripts. Otherwise we could write one block more ba acident
Signed-off-by: Markus Niebel Markus.Niebel@tq-group.com --- include/configs/tqma6.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 311221d..9225bc1 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -133,8 +133,8 @@ "update_uboot=if tftp ${uboot}; then " \ "if itest ${filesize} > 0; then " \ "mmc dev ${mmcdev}; mmc rescan; " \ - "setexpr blkc ${filesize} / 0x200; " \ - "setexpr blkc ${blkc} + 1; " \ + "setexpr blkc ${filesize} + 0x1ff; " \ + "setexpr blkc ${blkc} / 0x200; " \ "if itest ${blkc} <= ${uboot_size}; then " \ "mmc write ${loadaddr} ${uboot_start} " \ "${blkc}; " \ @@ -145,8 +145,8 @@ "if tftp ${kernel}; then " \ "if itest ${filesize} > 0; then " \ "mmc dev ${mmcdev}; mmc rescan; " \ - "setexpr blkc ${filesize} / 0x200; " \ - "setexpr blkc ${blkc} + 1; " \ + "setexpr blkc ${filesize} + 0x1ff; " \ + "setexpr blkc ${blkc} / 0x200; " \ "if itest ${blkc} <= ${kernel_size}; then " \ "mmc write ${loadaddr} " \ "${kernel_start} ${blkc}; " \ @@ -157,8 +157,8 @@ "update_fdt=if tftp ${fdt_file}; then " \ "if itest ${filesize} > 0; then " \ "mmc dev ${mmcdev}; mmc rescan; " \ - "setexpr blkc ${filesize} / 0x200; " \ - "setexpr blkc ${blkc} + 1; " \ + "setexpr blkc ${filesize} + 0x1ff; " \ + "setexpr blkc ${blkc} / 0x200; " \ "if itest ${blkc} <= ${fdt_size}; then " \ "mmc write ${loadaddr} ${fdt_start} ${blkc}; " \ "fi; " \
From: Markus Niebel Markus.Niebel@tq-group.com
Signed-off-by: Markus Niebel Markus.Niebel@tq-group.com --- include/configs/tqma6.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 9225bc1..1c0a762 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -291,7 +291,7 @@ "uboot=u-boot.imx\0" \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ "fdt_addr="__stringify(TQMA6_FDT_ADDRESS)"\0" \ - "console=" CONSOLE_DEV "\0" \ + "console=" CONSOLE_DEV "\0" \ "cma_size="__stringify(TQMA6_CMA_SIZE)"\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \
participants (1)
-
Markus Niebel