ARM: IGEP0033: Updates for next release.

PATCH New Enric Balletbo i Serra 3 participants 12 messages Jul 25, 2013 – Aug 16, 2013

lore

Share & tools

lore

Enric Balletbo i Serra

author

2013-07-25 07:27 UTC #0 lore raw

cover ARM: IGEP0033: Updates for next release.

From: Enric Balletbo i Serra <[email protected]>

Hello,

These are some updates to improve the support for IGEP COM AQUILA. Please consider adding for next release.

Best regards,

Enric Balletbo i Serra (5):
ARM: IGEP0033: Remove undef of CONFIG_CMD_MEMTEST
ARM: IGEP0033: Add support for Flattened Device Tree.
ARM: IGEP0033: Remove CYGNUS name from header.
ARM: IGEP0033: Add support to boot from NAND.
ARM: IGEP0033: Remove duplicate / unused #defines.

 board/isee/igep0033/board.c |  2 +-
 board/isee/igep0033/board.h |  2 +-
 include/configs/igep0033.h  | 78 +++++++++++++++++++++++----------------------
 3 files changed, 42 insertions(+), 40 deletions(-)

Signature · 1 line

1.8.1.2

Enric Balletbo i Serra

author

2013-07-25 07:27 UTC #1 lore raw

PATCH 1/5 ARM: IGEP0033: Remove undef of CONFIG_CMD_MEMTEST

From: Enric Balletbo i Serra <[email protected]>

After commit:

79cd2f814b1c75efd47161ac27f4cbebf768240f config_cmd_default.h: Remove CONFIG_CMD_MEMTEST

It's not necessary to undef the CONFIG_CMD_MEMTEST, so we can remove it from configuration file.

Signed-off-by Enric Balletbo i Serra <[email protected]>

---
 include/configs/igep0033.h | 7 -------
 1 file changed, 7 deletions(-)

include/configs/igep0033.h +0 -7

index 12f28f8..41c083e 100644
@@ -59,13 +59,6 @@
 #define CONFIG_CMD_UBI
 #define CONFIG_CMD_UBIFS
 
-/*
- * Because the issues explained in doc/README.memory-test, the "mtest command
- * is considered deprecated. It should not be enabled in most normal ports of
- * U-Boot.
- */
-#undef CONFIG_CMD_MEMTEST
-
 #define CONFIG_BOOTDELAY		1	/* negative for no autoboot */
 #define CONFIG_ENV_VARS_UBOOT_CONFIG
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG

Signature · 1 line

1.8.1.2

Javier Martinez Canillas

2013-08-07 15:59 UTC #2 lore raw

PATCH 1/5 ARM: IGEP0033: Remove undef of CONFIG_CMD_MEMTEST

Quoted 33 lines · Enric Balletbo i Serra

From: Enric Balletbo i Serra <[email protected]>
After commit:
79cd2f814b1c75efd47161ac27f4cbebf768240f config_cmd_default.h: Remove CONFIG_CMD_MEMTEST
It's not necessary to undef the CONFIG_CMD_MEMTEST, so we can remove it from configuration file.
Signed-off-by Enric Balletbo i Serra <[email protected]>
---
 include/configs/igep0033.h | 7 -------
 1 file changed, 7 deletions(-)
include/configs/igep0033.h +0 -8
index 12f28f8..41c083e 100644
@@ -59,13 +59,6 @@
 #define CONFIG_CMD_UBI
 #define CONFIG_CMD_UBIFS
 
-/*
- * Because the issues explained in doc/README.memory-test, the "mtest command
- * is considered deprecated. It should not be enabled in most normal ports of
- * U-Boot.
- */
-#undef CONFIG_CMD_MEMTEST
-
 #define CONFIG_BOOTDELAY               1       /* negative for no autoboot */
 #define CONFIG_ENV_VARS_UBOOT_CONFIG
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
--

Quoted 2 lines

1.8.1.2

Reviewed-by Javier Martinez Canillas <[email protected]>

Enric Balletbo i Serra

author

2013-07-25 07:27 UTC #3 lore raw

PATCH 2/5 ARM: IGEP0033: Add support for Flattened Device Tree.

In reply to Enric Balletbo i Serra

Now, the default kernel to boot the IGEP COM AQUILA is device tree based. As old kernel is deprecated we should adapt the boot commands to use DTB files.

Also, with v3.9 and later of the Linux Kernel, uImage isn't builtable anymore by default, so we should switch to use the bootz command.

Signed-off-by Enric Balletbo i Serra <[email protected]>

---
 include/configs/igep0033.h | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

include/configs/igep0033.h +13 ~~-20~~

index 41c083e..be210a5 100644
@@ -41,6 +41,9 @@
 /* Display cpuinfo */
 #define CONFIG_DISPLAY_CPUINFO
 
+/* Flattened Device Tree */
+#define CONFIG_OF_LIBFDT
+
 /* Commands to include */
 #include <config_cmd_default.h>

@@ -63,37 +66,27 @@
 #define CONFIG_ENV_VARS_UBOOT_CONFIG
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 #define CONFIG_EXTRA_ENV_SETTINGS \
-	"loadaddr=0x80200000\0" \
-	"rdaddr=0x81000000\0" \
-	"bootfile=/boot/uImage\0" \
+	"loadaddr=0x80F80000\0" \
+	"dtbaddr=0x80200000\0" \
+	"bootdir=/boot\0" \
+	"bootfile=zImage\0" \
+	"dtbfile=am335x-base0033.dtb\0" \
 	"console=ttyO0,115200n8\0" \
-	"optargs=\0" \
 	"mmcdev=0\0" \
 	"mmcroot=/dev/mmcblk0p2 rw\0" \
 	"mmcrootfstype=ext4 rootwait\0" \
-	"ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=${rdaddr},64M\0" \
-	"ramrootfstype=ext2\0" \
 	"mmcargs=setenv bootargs console=${console} " \
-		"${optargs} " \
 		"root=${mmcroot} " \
 		"rootfstype=${mmcrootfstype}\0" \
 	"bootenv=uEnv.txt\0" \
 	"loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
 	"importbootenv=echo Importing environment from mmc ...; " \
-		"env import -t $loadaddr $filesize\0" \
-	"ramargs=setenv bootargs console=${console} " \
-		"${optargs} " \
-		"root=${ramroot} " \
-		"rootfstype=${ramrootfstype}\0" \
-	"loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
-	"loaduimagefat=load mmc ${mmcdev} ${loadaddr} ${bootfile}\0" \
-	"loaduimage=load mmc ${mmcdev}:2 ${loadaddr} ${bootfile}\0" \
+		"env import -t ${loadaddr} ${filesize}\0" \
+	"mmcload=load mmc ${mmcdev}:2 ${loadaddr} ${bootdir}/${bootfile}; " \
+		"load mmc ${mmcdev}:2 ${dtbaddr} ${bootdir}/${dtbfile}\0" \
 	"mmcboot=echo Booting from mmc ...; " \
 		"run mmcargs; " \
-		"bootm ${loadaddr}\0" \
-	"ramboot=echo Booting from ramdisk ...; " \
-		"run ramargs; " \
-		"bootm ${loadaddr}\0" \
+		"bootz ${loadaddr} - ${dtbaddr}\0" \
 
 #define CONFIG_BOOTCOMMAND \
 	"mmc dev ${mmcdev}; if mmc rescan; then " \

@@ -106,7 +99,7 @@
 			"echo Running uenvcmd ...;" \
 			"run uenvcmd;" \
 		"fi;" \
-		"if run loaduimage; then " \
+		"if run mmcload; then " \
 			"run mmcboot;" \
 		"fi;" \
 	"fi;" \

Signature · 1 line

1.8.1.2

Javier Martinez Canillas

2013-08-07 16:01 UTC #4 lore raw

PATCH 2/5 ARM: IGEP0033: Add support for Flattened Device Tree.

Quoted 82 lines · Enric Balletbo i Serra

Now, the default kernel to boot the IGEP COM AQUILA is device tree based. As old kernel is deprecated we should adapt the boot commands to use DTB files.

Also, with v3.9 and later of the Linux Kernel, uImage isn't builtable anymore by default, so we should switch to use the bootz command.

Signed-off-by Enric Balletbo i Serra <[email protected]>

---
 include/configs/igep0033.h | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

include/configs/igep0033.h +13 ~~-21~~

index 41c083e..be210a5 100644
@@ -41,6 +41,9 @@
 /* Display cpuinfo */
 #define CONFIG_DISPLAY_CPUINFO
 
+/* Flattened Device Tree */
+#define CONFIG_OF_LIBFDT
+
 /* Commands to include */
 #include <config_cmd_default.h>

@@ -63,37 +66,27 @@
 #define CONFIG_ENV_VARS_UBOOT_CONFIG
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 #define CONFIG_EXTRA_ENV_SETTINGS \
-       "loadaddr=0x80200000\0" \
-       "rdaddr=0x81000000\0" \
-       "bootfile=/boot/uImage\0" \
+       "loadaddr=0x80F80000\0" \
+       "dtbaddr=0x80200000\0" \
+       "bootdir=/boot\0" \
+       "bootfile=zImage\0" \
+       "dtbfile=am335x-base0033.dtb\0" \
        "console=ttyO0,115200n8\0" \
-       "optargs=\0" \
        "mmcdev=0\0" \
        "mmcroot=/dev/mmcblk0p2 rw\0" \
        "mmcrootfstype=ext4 rootwait\0" \
-       "ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=${rdaddr},64M\0" \
-       "ramrootfstype=ext2\0" \
        "mmcargs=setenv bootargs console=${console} " \
-               "${optargs} " \
                "root=${mmcroot} " \
                "rootfstype=${mmcrootfstype}\0" \
        "bootenv=uEnv.txt\0" \
        "loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
        "importbootenv=echo Importing environment from mmc ...; " \
-               "env import -t $loadaddr $filesize\0" \
-       "ramargs=setenv bootargs console=${console} " \
-               "${optargs} " \
-               "root=${ramroot} " \
-               "rootfstype=${ramrootfstype}\0" \
-       "loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
-       "loaduimagefat=load mmc ${mmcdev} ${loadaddr} ${bootfile}\0" \
-       "loaduimage=load mmc ${mmcdev}:2 ${loadaddr} ${bootfile}\0" \
+               "env import -t ${loadaddr} ${filesize}\0" \
+       "mmcload=load mmc ${mmcdev}:2 ${loadaddr} ${bootdir}/${bootfile}; " \
+               "load mmc ${mmcdev}:2 ${dtbaddr} ${bootdir}/${dtbfile}\0" \
        "mmcboot=echo Booting from mmc ...; " \
                "run mmcargs; " \
-               "bootm ${loadaddr}\0" \
-       "ramboot=echo Booting from ramdisk ...; " \
-               "run ramargs; " \
-               "bootm ${loadaddr}\0" \
+               "bootz ${loadaddr} - ${dtbaddr}\0" \
 
 #define CONFIG_BOOTCOMMAND \
        "mmc dev ${mmcdev}; if mmc rescan; then " \

@@ -106,7 +99,7 @@
                        "echo Running uenvcmd ...;" \
                        "run uenvcmd;" \
                "fi;" \
-               "if run loaduimage; then " \
+               "if run mmcload; then " \
                        "run mmcboot;" \
                "fi;" \
        "fi;" \
--

Quoted 2 lines

1.8.1.2

Reviewed-by Javier Martinez Canillas <[email protected]>

Enric Balletbo i Serra

author

2013-07-25 07:27 UTC #5 lore raw

PATCH 3/5 ARM: IGEP0033: Remove CYGNUS name from header.

In reply to Enric Balletbo i Serra

From: Enric Balletbo i Serra <[email protected]>

We will not use CYGNUS names for any IGEP COM based on AM335x processor, so, to avoid confusion, remove from headers.

Signed-off-by Enric Balletbo i Serra <[email protected]>

---
 board/isee/igep0033/board.c | 2 +-
 board/isee/igep0033/board.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

board/isee/igep0033/board.c +1 -1

index ea3bea5..b3fcbb3 100644
@@ -1,5 +1,5 @@
 /*
- * Board functions for IGEP COM AQUILA/CYGNUS based boards
+ * Board functions for IGEP COM AQUILA based boards
  *
  * Copyright (C) 2013, ISEE 2007 SL - http://www.isee.biz/
  *

board/isee/igep0033/board.h +1 -1

index 37988e0..4368ee6 100644
@@ -1,5 +1,5 @@
 /*
- * IGEP COM AQUILA/CYGNUS boards information header
+ * IGEP COM AQUILA boards information header
  *
  * Copyright (C) 2013, ISEE 2007 SL - http://www.isee.biz/
  *

Signature · 1 line

1.8.1.2

Javier Martinez Canillas

2013-08-07 16:01 UTC #6 lore raw

PATCH 3/5 ARM: IGEP0033: Remove CYGNUS name from header.

Quoted 34 lines · Enric Balletbo i Serra

From: Enric Balletbo i Serra <[email protected]>
We will not use CYGNUS names for any IGEP COM based on AM335x processor, so, to avoid confusion, remove from headers.
Signed-off-by Enric Balletbo i Serra <[email protected]>
---
 board/isee/igep0033/board.c | 2 +-
 board/isee/igep0033/board.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
board/isee/igep0033/board.c +1 -1
index ea3bea5..b3fcbb3 100644
@@ -1,5 +1,5 @@
 /*
- * Board functions for IGEP COM AQUILA/CYGNUS based boards
+ * Board functions for IGEP COM AQUILA based boards
  *
  * Copyright (C) 2013, ISEE 2007 SL - http://www.isee.biz/
  *
board/isee/igep0033/board.h +1 -2
index 37988e0..4368ee6 100644
@@ -1,5 +1,5 @@
 /*
- * IGEP COM AQUILA/CYGNUS boards information header
+ * IGEP COM AQUILA boards information header
  *
  * Copyright (C) 2013, ISEE 2007 SL - http://www.isee.biz/
  *
--

Quoted 2 lines

1.8.1.2

Reviewed-by Javier Martinez Canillas <[email protected]>

Enric Balletbo i Serra

author

2013-07-25 07:27 UTC #7 lore raw

PATCH 4/5 ARM: IGEP0033: Add support to boot from NAND.

In reply to Enric Balletbo i Serra

From: Enric Balletbo i Serra <[email protected]>

Add to the default environment the possibily to boot from NAND using a ubi rootfs. Also the partition scheme is set as follows:

                  Start      Size
    SPL         : 0x00000000 0x00080000 (512KiB)
    U-Boot      : 0x00080000 0x00100000 (1MiB)
    U-Boot Env  : 0x00180000 0x00020000 (128KiB)
    File System : 0x001C0000 -

The ubiboot script gets the kernel and the dtb file from the boot directory of the File System.

Signed-off-by Enric Balletbo i Serra <[email protected]>

---
 include/configs/igep0033.h | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

include/configs/igep0033.h +27 -5

index be210a5..3d08cfa 100644
@@ -62,6 +62,10 @@
 #define CONFIG_CMD_UBI
 #define CONFIG_CMD_UBIFS
 
+/* Make the verbose messages from UBI stop printing */
+#define CONFIG_UBI_SILENCE_MSG
+#define CONFIG_UBIFS_SILENCE_MSG
+
 #define CONFIG_BOOTDELAY		1	/* negative for no autoboot */
 #define CONFIG_ENV_VARS_UBOOT_CONFIG
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG

@@ -72,21 +76,34 @@
 	"bootfile=zImage\0" \
 	"dtbfile=am335x-base0033.dtb\0" \
 	"console=ttyO0,115200n8\0" \
+	"mtdids=" MTDIDS_DEFAULT "\0" \
+	"mtdparts=" MTDPARTS_DEFAULT "\0" \
 	"mmcdev=0\0" \
 	"mmcroot=/dev/mmcblk0p2 rw\0" \
+	"ubiroot=ubi0:filesystem rw ubi.mtd=3,2048\0" \
 	"mmcrootfstype=ext4 rootwait\0" \
+	"ubirootfstype=ubifs rootwait\0" \
 	"mmcargs=setenv bootargs console=${console} " \
 		"root=${mmcroot} " \
 		"rootfstype=${mmcrootfstype}\0" \
+	"ubiargs=setenv bootargs console=${console} " \
+		"root=${ubiroot} " \
+		"rootfstype=${ubirootfstype}\0" \
 	"bootenv=uEnv.txt\0" \
 	"loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
 	"importbootenv=echo Importing environment from mmc ...; " \
 		"env import -t ${loadaddr} ${filesize}\0" \
 	"mmcload=load mmc ${mmcdev}:2 ${loadaddr} ${bootdir}/${bootfile}; " \
 		"load mmc ${mmcdev}:2 ${dtbaddr} ${bootdir}/${dtbfile}\0" \
+	"ubiload=ubi part filesystem 2048; ubifsmount ubi0; " \
+		"ubifsload ${loadaddr} ${bootdir}/${bootfile}; " \
+		"ubifsload ${dtbaddr} ${bootdir}/${dtbfile} \0" \
 	"mmcboot=echo Booting from mmc ...; " \
 		"run mmcargs; " \
 		"bootz ${loadaddr} - ${dtbaddr}\0" \
+	"ubiboot=echo Booting from nand (ubifs) ...; " \
+		"run ubiargs; run ubiload; " \
+		"bootz ${loadaddr} - ${dtbaddr}\0" \
 
 #define CONFIG_BOOTCOMMAND \
 	"mmc dev ${mmcdev}; if mmc rescan; then " \

@@ -102,6 +119,8 @@
 		"if run mmcload; then " \
 			"run mmcboot;" \
 		"fi;" \
+	"else " \
+		"run ubiboot;" \
 	"fi;" \
 
 /* Max number of command args */

@@ -181,18 +200,21 @@
 #define CONFIG_SYS_MAX_NAND_DEVICE	1
 #define CONFIG_SYS_NAND_ONFI_DETECTION	1
 #define CONFIG_SYS_ENV_SECT_SIZE	(128 << 10)	/* 128 KiB */
+#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 #define CONFIG_ENV_IS_IN_NAND
-#define CONFIG_ENV_OFFSET		0x260000 /* environment starts here */
+#define CONFIG_ENV_OFFSET		0x180000 /* environment starts here */
+#define CONFIG_ENV_ADDR_REDUND		(CONFIG_ENV_OFFSET + CONFIG_SYS_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND		(CONFIG_ENV_SIZE)
 
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_MTD_DEVICE
 #define CONFIG_RBTREE
 #define CONFIG_LZO
 
-#define MTDIDS_DEFAULT			"nand0=nand"
-#define MTDPARTS_DEFAULT		"mtdparts=nand:512k(SPL),"\
-					"1m(U-Boot),128k(U-Boot Env),"\
-					"5m(Kernel),-(File System)"
+#define MTDIDS_DEFAULT			"nand0=omap2-nand.0"
+#define MTDPARTS_DEFAULT		"mtdparts=omap2-nand.0:512k(spl),"\
+					"1m(uboot),256k(environment),"\
+					"-(filesystem)"
 
 /* Unsupported features */
 #undef CONFIG_USE_IRQ

Signature · 1 line

1.8.1.2

Javier Martinez Canillas

2013-08-07 16:03 UTC #8 lore raw

PATCH 4/5 ARM: IGEP0033: Add support to boot from NAND.

Quoted 106 lines · Enric Balletbo i Serra

From: Enric Balletbo i Serra <[email protected]>

Add to the default environment the possibily to boot from NAND using a ubi rootfs. Also the partition scheme is set as follows:

                  Start      Size
    SPL         : 0x00000000 0x00080000 (512KiB)
    U-Boot      : 0x00080000 0x00100000 (1MiB)
    U-Boot Env  : 0x00180000 0x00020000 (128KiB)
    File System : 0x001C0000 -

The ubiboot script gets the kernel and the dtb file from the boot directory of the File System.

Signed-off-by Enric Balletbo i Serra <[email protected]>

---
 include/configs/igep0033.h | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

include/configs/igep0033.h +27 -6

index be210a5..3d08cfa 100644
@@ -62,6 +62,10 @@
 #define CONFIG_CMD_UBI
 #define CONFIG_CMD_UBIFS
 
+/* Make the verbose messages from UBI stop printing */
+#define CONFIG_UBI_SILENCE_MSG
+#define CONFIG_UBIFS_SILENCE_MSG
+
 #define CONFIG_BOOTDELAY               1       /* negative for no autoboot */
 #define CONFIG_ENV_VARS_UBOOT_CONFIG
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG

@@ -72,21 +76,34 @@
        "bootfile=zImage\0" \
        "dtbfile=am335x-base0033.dtb\0" \
        "console=ttyO0,115200n8\0" \
+       "mtdids=" MTDIDS_DEFAULT "\0" \
+       "mtdparts=" MTDPARTS_DEFAULT "\0" \
        "mmcdev=0\0" \
        "mmcroot=/dev/mmcblk0p2 rw\0" \
+       "ubiroot=ubi0:filesystem rw ubi.mtd=3,2048\0" \
        "mmcrootfstype=ext4 rootwait\0" \
+       "ubirootfstype=ubifs rootwait\0" \
        "mmcargs=setenv bootargs console=${console} " \
                "root=${mmcroot} " \
                "rootfstype=${mmcrootfstype}\0" \
+       "ubiargs=setenv bootargs console=${console} " \
+               "root=${ubiroot} " \
+               "rootfstype=${ubirootfstype}\0" \
        "bootenv=uEnv.txt\0" \
        "loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
        "importbootenv=echo Importing environment from mmc ...; " \
                "env import -t ${loadaddr} ${filesize}\0" \
        "mmcload=load mmc ${mmcdev}:2 ${loadaddr} ${bootdir}/${bootfile}; " \
                "load mmc ${mmcdev}:2 ${dtbaddr} ${bootdir}/${dtbfile}\0" \
+       "ubiload=ubi part filesystem 2048; ubifsmount ubi0; " \
+               "ubifsload ${loadaddr} ${bootdir}/${bootfile}; " \
+               "ubifsload ${dtbaddr} ${bootdir}/${dtbfile} \0" \
        "mmcboot=echo Booting from mmc ...; " \
                "run mmcargs; " \
                "bootz ${loadaddr} - ${dtbaddr}\0" \
+       "ubiboot=echo Booting from nand (ubifs) ...; " \
+               "run ubiargs; run ubiload; " \
+               "bootz ${loadaddr} - ${dtbaddr}\0" \
 
 #define CONFIG_BOOTCOMMAND \
        "mmc dev ${mmcdev}; if mmc rescan; then " \

@@ -102,6 +119,8 @@
                "if run mmcload; then " \
                        "run mmcboot;" \
                "fi;" \
+       "else " \
+               "run ubiboot;" \
        "fi;" \
 
 /* Max number of command args */

@@ -181,18 +200,21 @@
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 #define CONFIG_SYS_NAND_ONFI_DETECTION 1
 #define CONFIG_SYS_ENV_SECT_SIZE       (128 << 10)     /* 128 KiB */
+#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 #define CONFIG_ENV_IS_IN_NAND
-#define CONFIG_ENV_OFFSET              0x260000 /* environment starts here */
+#define CONFIG_ENV_OFFSET              0x180000 /* environment starts here */
+#define CONFIG_ENV_ADDR_REDUND         (CONFIG_ENV_OFFSET + CONFIG_SYS_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND         (CONFIG_ENV_SIZE)
 
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_MTD_DEVICE
 #define CONFIG_RBTREE
 #define CONFIG_LZO
 
-#define MTDIDS_DEFAULT                 "nand0=nand"
-#define MTDPARTS_DEFAULT               "mtdparts=nand:512k(SPL),"\
-                                       "1m(U-Boot),128k(U-Boot Env),"\
-                                       "5m(Kernel),-(File System)"
+#define MTDIDS_DEFAULT                 "nand0=omap2-nand.0"
+#define MTDPARTS_DEFAULT               "mtdparts=omap2-nand.0:512k(spl),"\
+                                       "1m(uboot),256k(environment),"\
+                                       "-(filesystem)"
 
 /* Unsupported features */
 #undef CONFIG_USE_IRQ
--

Quoted 2 lines

1.8.1.2

Reviewed-by Javier Martinez Canillas <[email protected]>

Enric Balletbo i Serra

author

2013-07-25 07:27 UTC #9 lore raw

PATCH 5/5 ARM: IGEP0033: Remove duplicate / unused #defines.

In reply to Enric Balletbo i Serra

From: Enric Balletbo i Serra <[email protected]>

As config was originally based on am335x_evm.h we have also some duplicate / unnused #defines.

Commit 15191c91 removed these #defines on various AM335x boards but not for IGEP COM AQUILA. This patch simply removes them for this board.

Signed-off-by Enric Balletbo i Serra <[email protected]>

---
 include/configs/igep0033.h | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

include/configs/igep0033.h +1 -7

index 3d08cfa..de60f75 100644
@@ -136,7 +136,6 @@
 /* Boot Argument Buffer Size */
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 #define CONFIG_SYS_LOAD_ADDR		0x81000000 /* Default load address */
-#define CONFIG_SYS_HZ			1000 /* 1ms clock */
 
 /* Physical Memory Map */
 #define CONFIG_NR_DRAM_BANKS		1		/*  1 bank of DRAM */

@@ -149,7 +148,7 @@
 /* Platform/Board specific defs */
 #define CONFIG_SYS_TIMERBASE		0x48040000	/* Use Timer2 */
 #define CONFIG_SYS_PTV			2	/* Divisor: 2^(PTV+1) => 8 */
-#define CONFIG_SYS_HZ			1000
+#define CONFIG_SYS_HZ			1000	/* 1ms clock */
 
 /* NS16550 Configuration */
 #define CONFIG_SYS_NS16550

@@ -158,7 +157,6 @@
 #define CONFIG_SYS_NS16550_CLK		(48000000)
 #define CONFIG_SYS_NS16550_COM1		0x44e09000	/* UART0 */
 
-#define CONFIG_SERIAL_MULTI
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200

@@ -272,10 +270,6 @@
 #define CONFIG_SYS_NAND_ECCSIZE		512
 #define CONFIG_SYS_NAND_ECCBYTES	14
 
-#define CONFIG_SYS_NAND_ECCSTEPS	4
-#define	CONFIG_SYS_NAND_ECCTOTAL	(CONFIG_SYS_NAND_ECCBYTES * \
-						CONFIG_SYS_NAND_ECCSTEPS)
-
 #define	CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_TEXT_BASE
 
 #define CONFIG_SYS_NAND_U_BOOT_OFFS	0x80000

Signature · 1 line

1.8.1.2

Javier Martinez Canillas

2013-08-07 16:14 UTC #10 lore raw

PATCH 5/5 ARM: IGEP0033: Remove duplicate / unused #defines.

Hi Enric,

Quoted 8 lines · Enric Balletbo i Serra

From: Enric Balletbo i Serra <[email protected]>
As config was originally based on am335x_evm.h we have also some duplicate / unnused #defines.
Commit 15191c91 removed these #defines on various AM335x boards but not for IGEP COM AQUILA. This patch simply removes them for this board.

Hi Enric,

This is why I think we should rename igep0033.h => am335x_igep0033.h or something and do the same for igep00x0.h. Otherwise we miss fixes/cleanups when people search for a pattern (i.e:
include/configs/omap3_*).

This is totally unrelated to this patch though, I just wanted to point this out to take into account once we do the refactor to make both igep0033.h and igep00x0.h share common code.

Quoted 46 lines

Signed-off-by Enric Balletbo i Serra <[email protected]>

---
 include/configs/igep0033.h | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

include/configs/igep0033.h +1 -8

index 3d08cfa..de60f75 100644
@@ -136,7 +136,6 @@
 /* Boot Argument Buffer Size */
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 #define CONFIG_SYS_LOAD_ADDR           0x81000000 /* Default load address */
-#define CONFIG_SYS_HZ                  1000 /* 1ms clock */
 
 /* Physical Memory Map */
 #define CONFIG_NR_DRAM_BANKS           1               /*  1 bank of DRAM */

@@ -149,7 +148,7 @@
 /* Platform/Board specific defs */
 #define CONFIG_SYS_TIMERBASE           0x48040000      /* Use Timer2 */
 #define CONFIG_SYS_PTV                 2       /* Divisor: 2^(PTV+1) => 8 */
-#define CONFIG_SYS_HZ                  1000
+#define CONFIG_SYS_HZ                  1000    /* 1ms clock */
 
 /* NS16550 Configuration */
 #define CONFIG_SYS_NS16550

@@ -158,7 +157,6 @@
 #define CONFIG_SYS_NS16550_CLK         (48000000)
 #define CONFIG_SYS_NS16550_COM1                0x44e09000      /* UART0 */
 
-#define CONFIG_SERIAL_MULTI
 #define CONFIG_CONS_INDEX              1
 #define CONFIG_BAUDRATE                        115200

@@ -272,10 +270,6 @@
 #define CONFIG_SYS_NAND_ECCSIZE                512
 #define CONFIG_SYS_NAND_ECCBYTES       14
 
-#define CONFIG_SYS_NAND_ECCSTEPS       4
-#define        CONFIG_SYS_NAND_ECCTOTAL        (CONFIG_SYS_NAND_ECCBYTES * \
-                                               CONFIG_SYS_NAND_ECCSTEPS)
-
 #define        CONFIG_SYS_NAND_U_BOOT_START    CONFIG_SYS_TEXT_BASE
 
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x80000
--

Quoted 2 lines

1.8.1.2

Reviewed-by Javier Martinez Canillas <[email protected]>

Tom Rini

2013-08-16 13:35 UTC #11 lore raw

cover ARM: IGEP0033: Updates for next release.

In reply to Enric Balletbo i Serra

Quoted 16 lines · Enric Balletbo i Serra

From: Enric Balletbo i Serra <[email protected]>
Hello,
These are some updates to improve the support for IGEP COM AQUILA. Please consider adding for next release.
Best regards,
Enric Balletbo i Serra (5):
ARM: IGEP0033: Remove undef of CONFIG_CMD_MEMTEST
ARM: IGEP0033: Add support for Flattened Device Tree.
ARM: IGEP0033: Remove CYGNUS name from header.
ARM: IGEP0033: Add support to boot from NAND.
ARM: IGEP0033: Remove duplicate / unused #defines.

Quoted 4 lines

 board/isee/igep0033/board.c |  2 +-
 board/isee/igep0033/board.h |  2 +-
 include/configs/igep0033.h  | 78 +++++++++++++++++++++++----------------------
 3 files changed, 42 insertions(+), 40 deletions(-)

Applied to u-boot-ti/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130816/f5064433/attachment.pgp>