On Thu, Jul 25, 2013 at 9:27 AM, Enric Balletbo i Serra eballetbo@gmail.com wrote:

From: Enric Balletbo i Serra eballetbo@iseebcn.com

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 eballetbo@iseebcn.com

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

diff --git a/include/configs/igep0033.h b/include/configs/igep0033.h index 12f28f8..41c083e 100644 --- a/include/configs/igep0033.h +++ b/include/configs/igep0033.h @@ -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

1.8.1.2

Reviewed-by: Javier Martinez Canillas javier@dowhile0.org

On Thu, Jul 25, 2013 at 9:27 AM, Enric Balletbo i Serra eballetbo@gmail.com wrote:

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 eballetbo@iseebcn.com

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

diff --git a/include/configs/igep0033.h b/include/configs/igep0033.h index 41c083e..be210a5 100644 --- a/include/configs/igep0033.h +++ b/include/configs/igep0033.h @@ -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;" \
  

-- 1.8.1.2

Reviewed-by: Javier Martinez Canillas javier@dowhile0.org

On Thu, Jul 25, 2013 at 9:27 AM, Enric Balletbo i Serra eballetbo@gmail.com wrote:

From: Enric Balletbo i Serra eballetbo@iseebcn.com

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 eballetbo@iseebcn.com

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

diff --git a/board/isee/igep0033/board.c b/board/isee/igep0033/board.c index ea3bea5..b3fcbb3 100644 --- a/board/isee/igep0033/board.c +++ b/board/isee/igep0033/board.c @@ -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/

diff --git a/board/isee/igep0033/board.h b/board/isee/igep0033/board.h index 37988e0..4368ee6 100644 --- a/board/isee/igep0033/board.h +++ b/board/isee/igep0033/board.h @@ -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/

-- 1.8.1.2

Reviewed-by: Javier Martinez Canillas javier@dowhile0.org

On Thu, Jul 25, 2013 at 9:27 AM, Enric Balletbo i Serra eballetbo@gmail.com wrote:

From: Enric Balletbo i Serra eballetbo@iseebcn.com

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 eballetbo@iseebcn.com

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

diff --git a/include/configs/igep0033.h b/include/configs/igep0033.h index be210a5..3d08cfa 100644 --- a/include/configs/igep0033.h +++ b/include/configs/igep0033.h @@ -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

1.8.1.2

Reviewed-by: Javier Martinez Canillas javier@dowhile0.org

Hi Enric,

On Thu, Jul 25, 2013 at 9:27 AM, Enric Balletbo i Serra eballetbo@gmail.com wrote:

From: Enric Balletbo i Serra eballetbo@iseebcn.com

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.

Signed-off-by: Enric Balletbo i Serra eballetbo@iseebcn.com

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

diff --git a/include/configs/igep0033.h b/include/configs/igep0033.h index 3d08cfa..de60f75 100644 --- a/include/configs/igep0033.h +++ b/include/configs/igep0033.h @@ -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

1.8.1.2

Reviewed-by: Javier Martinez Canillas javier@dowhile0.org