arm, imx6, aristainetos: board updates

- use linux display timing settings
- change backlight duty cycle 500ns
- some defaultenvironment changes
- change fit_addr_r to 0x14000000 as needed if
  MAX_LOCKDEP_SUBCLASSES in linux gets increased.
- Environment now at 0xd0000 in nand flash

Signed-off-by: Heiko Schocher <hs@denx.de>

diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c
index 67ac260055233eb8bfa4a5060e3a7035026602a2..8330bb64bdae56163054bb266dc88b5af0443397 100644 (file)
--- a/board/aristainetos/aristainetos.c
+++ b/board/aristainetos/aristainetos.c
@@ -321,8 +321,8 @@ static void enable_lvds(struct display_info_t const *dev)
        /* enable backlight PWM 3 */
        if (pwm_init(2, 0, 0))
                goto error;
-       /* duty cycle 200ns, period: 3000ns */
-       if (pwm_config(2, 200, 3000))
+       /* duty cycle 500ns, period: 3000ns */
+       if (pwm_config(2, 500, 3000))
                goto error;
        if (pwm_enable(2))
                goto error;
@@ -350,8 +350,8 @@ struct display_info_t const displays[] = {
                        .right_margin   = 88,
                        .upper_margin   = 10,
                        .lower_margin   = 10,
-                       .hsync_len      = 25,
-                       .vsync_len      = 1,
+                       .hsync_len      = 80,
+                       .vsync_len      = 25,
                        .sync           = 0,
                        .vmode          = FB_VMODE_NONINTERLACED
                }

diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h
index e6a08df4ba7de13082e4df476120b3743a5a6a51..3066fd030e4163e8798793a207515e1b2f5fe91b 100644 (file)
--- a/include/configs/aristainetos.h
+++ b/include/configs/aristainetos.h
@@ -1,4 +1,5 @@
 /*
+ * (C) Copyright 2015
  * (C) Copyright 2014
  * Heiko Schocher, DENX Software Engineering, hs@denx.de.
  *
@@ -24,8 +25,7 @@
 #include <asm/imx-common/gpio.h>
 
 #define CONFIG_MACH_TYPE       4501
-#define CONFIG_MMCROOT         "/dev/mmcblk0p2"
-#define CONFIG_DEFAULT_FDT_FILE        "aristainetos.dtb"
+#define CONFIG_MMCROOT         "/dev/mmcblk0p1"
 #define CONFIG_HOSTNAME                aristainetos
 #define PHYS_SDRAM_SIZE                (1u * 1024 * 1024 * 1024)
 
@@ -81,7 +81,6 @@
 #define CONFIG_SF_DEFAULT_SPEED                20000000
 #define CONFIG_SF_DEFAULT_MODE         SPI_MODE_0
 #define CONFIG_SYS_SPI_ST_ENABLE_WP_PIN
-
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX              1
@@ -101,84 +100,108 @@
 #define CONFIG_SYS_TEXT_BASE           0x17800000
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
-       "uimage=uImage\0" \
-       "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
-       "fdt_addr_r=0x11000000\0" \
-       "kernel_addr_r=0x12000000\0" \
-       "kernel_file=uImage\0" \
-       "boot_fdt=try\0" \
-       "ip_dyn=yes\0" \
+       "script=u-boot.scr\0" \
+       "fit_file=/boot/system.itb\0" \
+       "loadaddr=0x12000000\0" \
+       "fit_addr_r=0x14000000\0" \
+       "uboot=/boot/u-boot.imx\0" \
+       "uboot_sz=d0000\0" \
+       "rescue_sys_addr=f0000\0" \
+       "rescue_sys_length=f10000\0" \
+       "board_type=aristainetos7@1\0" \
+       "panel=lb07wv8\0" \
+       "splashpos=m,m\0" \
        "console=" CONFIG_CONSOLE_DEV "\0" \
        "fdt_high=0xffffffff\0"   \
        "initrd_high=0xffffffff\0" \
+       "mtdids=nand0=gpmi-nand,nor0=spi3.0\0" \
+       "mtdparts=mtdparts=spi3.0:832k(u-boot),64k(env),64k(env-red)," \
+               "-(rescue-system);gpmi-nand:-(ubi)\0" \
+       "addmisc=setenv bootargs ${bootargs} consoleblank=0\0" \
+       "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" \
+       "set_fit_default=fdt addr ${fit_addr_r};fdt set /configurations " \
+               "default ${board_type}\0" \
+       "get_env=mw ${loadaddr} 0 0x20000;" \
+               "mmc rescan;" \
+               "ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} env.txt;" \
+               "env import -t ${loadaddr}\0" \
+       "default_env=mw ${loadaddr} 0 0x20000;" \
+               "env export -t ${loadaddr} serial# ethaddr eth1addr " \
+               "board_type panel;" \
+               "env default -a;" \
+               "env import -t ${loadaddr}\0" \
+       "loadbootscript=" \
+               "ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
+       "bootscript=echo Running bootscript from mmc ...; " \
+               "source\0" \
        "mmcpart=1\0" \
-       "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
+       "mmcdev=0\0" \
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
        "mmcargs=setenv bootargs console=${console},${baudrate} " \
                "root=${mmcroot}\0" \
-       "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${kernel_addr_r} " \
-               "${uimage}\0" \
-       "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} " \
-               "${fdt_file}\0" \
        "mmcboot=echo Booting from mmc ...; " \
-               "run mmcargs;run loadimage loadfdt fdt_setup;" \
-               "bootm ${kernel_addr_r} - ${fdt_addr_r};\0" \
-       "rootpath=/opt/eldk-5.5/armv7a-hf/rootfs-sato-sdk\0" \
-       "nfsopts=nfsvers=3 nolock rw\0" \
-       "netdev=eth0\0" \
-       "fdt_setup=fdt addr ${fdt_addr_r};fdt resize;fdt chosen;fdt board\0"\
-       "load_fdt=tftp ${fdt_addr_r} ${fdt_file}\0" \
-       "load_kernel=tftp ${kernel_addr_r} ${kernel_file}\0" \
-       "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" \
-       "get_env=mw ${loadaddr} 0x00000000 0x20000;" \
-               "tftp ${loadaddr} /tftpboot/aristainetos/env.txt;" \
-               "env import -t ${loadaddr}\0" \
-       "addmisc=setenv bootargs ${bootargs} maxcpus=1 loglevel=8\0" \
-       "bootargs_defaults=setenv bootargs ${console} ${mtdoops} " \
-               "${optargs}\0" \
-       "net_args=run bootargs_defaults;setenv bootargs ${bootargs} " \
-               "root=/dev/nfs nfsroot=${serverip}:${rootpath},${nfsopts} " \
-               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:" \
-               "${hostname}:${netdev}:off\0" \
-       "net_nfs=run load_kernel load_fdt;run net_args addmtd addmisc;" \
-               "run fdt_setup;bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \
-       "uboot=/tftpboot/aristainetos/u-boot.imx\0" \
-       "load_uboot=tftp ${loadaddr} ${uboot}\0" \
-       "uboot_sz=c0000\0" \
-       "upd_uboot=mw.b ${loadaddr} 0xff ${uboot_sz};" \
-               "mw.b 10200000 0x00 ${uboot_sz};" \
-               "run load_uboot;sf probe;sf erase 0 ${uboot_sz};" \
+               "run mmcargs addmtd addmisc set_fit_default;" \
+               "bootm ${fit_addr_r}\0" \
+       "mmc_load_fit=ext2load mmc ${mmcdev}:${mmcpart} ${fit_addr_r} " \
+               "${fit_file}\0" \
+       "mmc_load_uboot=ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} " \
+               "${uboot}\0" \
+       "mmc_upd_uboot=mw.b ${loadaddr} 0xff ${uboot_sz};" \
+               "setexpr cmp_buf ${loadaddr} + ${uboot_sz};" \
+               "setexpr uboot_maxsize ${uboot_sz} - 400;" \
+               "mw.b ${cmp_buf} 0x00 ${uboot_sz};" \
+               "run mmc_load_uboot;sf probe;sf erase 0 ${uboot_sz};" \
                "sf write ${loadaddr} 400 ${filesize};" \
-               "sf read 10200000 400 ${uboot_sz};" \
-               "cmp.b ${loadaddr} 10200000 bc000\0" \
-       "ubi_prep=ubi part ubi 2048;ubifsmount ubi:kernel\0" \
-       "load_kernel_ubi=ubifsload ${kernel_addr_r} uImage\0" \
-       "load_fdt_ubi=ubifsload ${fdt_addr_r} aristainetos.dtb\0" \
-       "ubi_nfs=run ubiprep load_kernel_ubi load_fdt_ubi;" \
-               "run net_args addmtd addmisc;run fdt_setup;" \
-               "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \
-       "rootfsname=rootfs\0" \
-       "ubi_args=run bootargs_defaults;setenv bootargs ${bootargs} " \
-               "ubi.mtd=0,2048 root=ubi0:${rootfsname} rootfstype=ubifs " \
-               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:" \
-               "${hostname}:${netdev}:off\0" \
-       "ubi_ubi=run ubi_prep load_kernel_ubi load_fdt_ubi;" \
-               "run bootargs_defaults ubi_args addmtd addmisc;" \
-               "run fdt_setup;bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \
-       "ubirootfs_file=/tftpboot/aristainetos/rootfs-minimal.ubifs\0" \
-       "upd_ubirootfs=run ubi_prep;tftp ${loadaddr} ${ubirootfs_file};" \
-               "ubi write ${loadaddr} rootfs ${filesize}\0" \
-       "ksz=800000\0" \
-       "rootsz=2000000\0" \
-       "usersz=8000000\0" \
-       "ubi_make=run ubi_prep;ubi create kernel ${ksz};" \
-               "ubi create rootfs ${rootsz};ubi create userfs ${usersz}\0"
+               "sf read ${cmp_buf} 400 ${uboot_sz};" \
+               "cmp.b ${loadaddr} ${cmp_buf} ${uboot_maxsize}\0" \
+       "ubiargs=setenv bootargs console=${console},${baudrate} " \
+               "ubi.mtd=0,2048 root=ubi0:rootfs rootfstype=ubifs\0 " \
+       "ubiboot=echo Booting from ubi ...; " \
+               "run ubiargs addmtd addmisc set_fit_default;" \
+               "bootm ${fit_addr_r}\0" \
+       "ubifs_load_fit=sf probe;ubi part ubi 2048;ubifsmount ubi:rootfs;" \
+               "ubifsload ${fit_addr_r} /boot/system.itb; " \
+               "imi ${fit_addr_r}\0 " \
+       "rescueargs=setenv bootargs console=${console},${baudrate} " \
+               "root=/dev/ram rw\0 " \
+       "rescueboot=echo Booting rescue system from NOR ...; " \
+               "run rescueargs addmtd addmisc set_fit_default;" \
+               "bootm ${fit_addr_r}\0" \
+       "rescue_load_fit=sf probe;sf read ${fit_addr_r} ${rescue_sys_addr} " \
+               "${rescue_sys_length}; imi ${fit_addr_r}\0 "
 
 #define CONFIG_BOOTCOMMAND \
        "mmc dev ${mmcdev};" \
        "if mmc rescan; then " \
-               "run mmcboot;" \
-       "else run ubi_ubi; fi"
+               "if run loadbootscript; then " \
+                       "run bootscript; " \
+               "else " \
+                       "if run mmc_load_fit; then " \
+                               "run mmcboot; " \
+                       "else " \
+                               "if run ubifs_load_fit; then " \
+                                       "run ubiboot; " \
+                               "else " \
+                                       "if run rescue_load_fit; then " \
+                                               "run rescueboot; " \
+                                       "else " \
+                                               "echo RESCUE SYSTEM BOOT " \
+                                                       "FAILURE;" \
+                                       "fi; " \
+                               "fi; " \
+                       "fi; " \
+               "fi; " \
+       "else " \
+               "if run ubifs_load_fit; then " \
+                       "run ubiboot; " \
+               "else " \
+                       "if run rescue_load_fit; then " \
+                               "run rescueboot; " \
+                       "else " \
+                               "echo RESCUE SYSTEM BOOT FAILURE;" \
+                       "fi; " \
+               "fi; " \
+       "fi"
 
 #define CONFIG_ARP_TIMEOUT             200UL
 
@@ -227,8 +250,8 @@
 #define CONFIG_ENV_SPI_MAX_HZ          CONFIG_SF_DEFAULT_SPEED
 #define CONFIG_ENV_SPI_MODE            CONFIG_SF_DEFAULT_MODE
 #define CONFIG_ENV_SECT_SIZE           (0x010000)
-#define CONFIG_ENV_OFFSET              (0x0c0000)
-#define CONFIG_ENV_OFFSET_REDUND       (0x0d0000)
+#define CONFIG_ENV_OFFSET              (0x0d0000)
+#define CONFIG_ENV_OFFSET_REDUND       (0x0e0000)
 
 #define CONFIG_OF_LIBFDT
 
@@ -289,9 +312,6 @@
 #define CONFIG_CMD_UBI
 #define CONFIG_CMD_UBIFS
 
-#define MTDIDS_DEFAULT                  "nand0=gpmi-nand"
-#define MTDPARTS_DEFAULT                "mtdparts=gpmi-nand:-(ubi)"
-
 #define CONFIG_MTD_UBI_FASTMAP
 #define CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT     1
 
@@ -321,5 +341,4 @@
 
 #define CONFIG_PWM_IMX
 #define CONFIG_IMX6_PWM_PER_CLK        66000000
-
 #endif                         /* __ARISTAINETOS_CONFIG_H */