diff --git a/README.md b/README.md index a761cff..448ae52 100755 --- a/README.md +++ b/README.md @@ -144,4 +144,12 @@ 192-MB 128-MB partition#2, ext4 : APP 320-MB all partition#3, ext4 : DATA - + ------------------------------------------ + 00-MB 64-MB reserved area + ------------------------------------------ + start size start size + U-boot : 1KB 640KB ( 0x2 0x500 ) + Logo : 1MB 4.5MB ( 0x800 0x2400 ) + DTB : 5.5MB 128KB ( 0x2C00 0x100 ) + KERNEL : 6MB 7MB ( 0x3000 0x3800 ) + RAMDISK : 14MB 32MB ( 0x7000 0x10000 ) diff --git a/bootloader/u-boot_2015_04/board/falinux/mx6s_prime_oven/mx6s_prime_oven.c b/bootloader/u-boot_2015_04/board/falinux/mx6s_prime_oven/mx6s_prime_oven.c index f4797c1..e680f2d 100755 --- a/bootloader/u-boot_2015_04/board/falinux/mx6s_prime_oven/mx6s_prime_oven.c +++ b/bootloader/u-boot_2015_04/board/falinux/mx6s_prime_oven/mx6s_prime_oven.c @@ -624,6 +624,10 @@ static const struct boot_mode board_boot_modes[] = { int misc_init_r(void) { + /* LOGO Image output... */ + run_command("run loadsplash", 0); + + /* setup gpio */ setup_gpio(); #ifdef CONFIG_CMD_BMODE @@ -631,5 +635,6 @@ int misc_init_r(void) #endif setenv_hex("reset_cause", get_imx_reset_cause()); + return 0; } diff --git a/bootloader/u-boot_2015_04/include/common.h b/bootloader/u-boot_2015_04/include/common.h index 8db3990..9adae66 100644 --- a/bootloader/u-boot_2015_04/include/common.h +++ b/bootloader/u-boot_2015_04/include/common.h @@ -88,7 +88,6 @@ typedef volatile unsigned char vu_char; #define CONFIG_SYS_SUPPORT_64BIT_DATA #endif - //#define DEBUG #ifdef DEBUG diff --git a/bootloader/u-boot_2015_04/include/configs/mx6s_prime_oven.h b/bootloader/u-boot_2015_04/include/configs/mx6s_prime_oven.h index c52b04e..111ba91 100755 --- a/bootloader/u-boot_2015_04/include/configs/mx6s_prime_oven.h +++ b/bootloader/u-boot_2015_04/include/configs/mx6s_prime_oven.h @@ -115,29 +115,28 @@ #define CONFIG_CMD_SETEXPR /* Framebuffer and LCD */ -#if 1 -#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE +#if 0 +#define CONFIG_VIDEO_LOGO #endif #define CONFIG_VIDEO #define CONFIG_VIDEO_IPUV3 #define CONFIG_CFB_CONSOLE #define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_SYS_CONSOLE_IS_IN_ENV +#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_BMP_16BPP -#define CONFIG_VIDEO_LOGO +#define CONFIG_CMD_BMP #define CONFIG_VIDEO_BMP_LOGO -#define CONFIG_IPUV3_CLK 198000000 // 260000000 +#define CONFIG_IPUV3_CLK 260000000 #define CONFIG_IMX_VIDEO_SKIP -#define CONFIG_CMD_BMP - +/* PWM */ #define CONFIG_PWM_IMX -#define CONFIG_IMX6_PWM_PER_CLK 66000000 - +#define CONFIG_IMX6_PWM_PER_CLK 66000000 /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE @@ -196,7 +195,8 @@ "netmask=255.255.0.0\0" \ "gatewayip=192.168.10.1\0" \ "ip_dyn=yes\0" \ - "video_lvds=video=mxcfb0:dev=ldb,LDB-LP133WD2,if=RGB666 ldb=spl0\0" \ + "panel=LDB-LP133WD2\0" \ + "video_lvds=video=mxcfb0:dev=ldb,${panel},if=RGB666 ldb=spl0\0" \ "video_vmalloc=fbmem=192M vmalloc=400M\0" \ "arg_option=fec.disable_giga=1\0" \ "mmcdev=0\0" \ @@ -205,25 +205,28 @@ "dtb_file=imx6s-prime-oven.dtb\0" \ "kernel_file=uImage\0" \ "ramdisk_file=ramdisk-prime_oven-64M.gz\0" \ + "logo_file=init.bmp\0" \ "uboot=tftpboot 0x12000000 ${tftpbase}/${uboot_file}; mmc dev ${mmcdev}; mmc write 0x12000000 2 500; if ext4ls mmc ${mmcdev}:1 boot; then ext4writ mmc ${mmcdev}:1 0x12000000 /boot/${uboot_file} ${filesize}; fi;\0" \ - "kernel=tftpboot 0x12000000 ${tftpbase}/${kernel_file}; mmc dev ${mmcdev}; mmc write 0x12000000 1000 4000; if ext4ls mmc ${mmcdev}:1 boot; then ext4write mmc ${mmcdev}:1 0x12000000 /boot/${kernel_file} ${filesize}; fi;\0" \ - "dtb=tftpboot 0x11F00000 ${tftpbase}/${dtb_file}; mmc dev ${mmcdev}; mmc write 0x11F00000 A00 100; if ext4ls mmc ${mmcdev}:1 boot; then ext4write mmc ${mmcdev}:1 0x11F00000 /boot/${dtb_file} ${filesize}; fi;\0" \ + "kernel=tftpboot 0x12000000 ${tftpbase}/${kernel_file}; mmc dev ${mmcdev}; mmc write 0x12000000 3000 3800; if ext4ls mmc ${mmcdev}:1 boot; then ext4write mmc ${mmcdev}:1 0x12000000 /boot/${kernel_file} ${filesize}; fi;\0" \ + "dtb=tftpboot 0x11F00000 ${tftpbase}/${dtb_file}; mmc dev ${mmcdev}; mmc write 0x11F00000 2C00 400; if ext4ls mmc ${mmcdev}:1 boot; then ext4write mmc ${mmcdev}:1 0x11F00000 /boot/${dtb_file} ${filesize}; fi;\0" \ "ramdisk=tftpboot 0x1E000000 ${tftpbase}/${ramdisk_file}; mmc dev ${mmcdev}; mmc write 0x1E000000 7000 10000; if ext4ls mmc ${mmcdev}:1 boot; then ext4write mmc ${mmcdev}:1 0x1E000000 /boot/${ramdisk_file} ${filesize}; fi;\0" \ - "bootram=mmc dev ${mmcdev}; mmcinfo; mmc read 0x11F00000 A00 100; mmc read 0x12000000 1000 4000; mmc read 0x1E000000 7000 10000; bootm 0x12000000 - 0x11F00000\0" \ + "logo=tftpboot 0x12000000 ${tftpbase}/${logo_file}; mmc dev ${mmcdev}; mmc write 0x12000000 800 2400; if ext4ls mmc ${mmcdev}:1 boot; then ext4write mmc ${mmcdev}:1 0x12000000 /boot/${logo_file} ${filesize}; fi;\0" \ + "loadsplash=echo ; mmc dev ${mmcdev}; if ext4load mmc ${mmcdev}:1 0x12000000 /boot/${logo_file}; then echo Boot Logo image patition area loader; else echo Boot Logo image raw area loader; mmc read 0x12000000 800 2400; fi; bmp info 0x12000000; bmp display 0x12000000 0 0; echo ;\0" \ + "bootram=mmc dev ${mmcdev}; mmcinfo; mmc read 0x11F00000 2C00 100; mmc read 0x12000000 3000 3800; mmc read 0x1E000000 7000 10000; bootm 0x12000000 - 0x11F00000\0" \ "bootload= echo ; echo Loading a bootable image ...; mmc dev ${mmcdev}; " \ "if ext4load mmc ${mmcdev}:1 0x11F00000 /boot/${dtb_file}; then " \ "echo Device Tree image patition area loader; " \ "echo ; " \ "else " \ "echo Device Tree image raw area loader; " \ - "mmc read 0x11F00000 A00 100; " \ + "mmc read 0x11F00000 2C00 100; " \ "echo ; " \ "fi; " \ "if ext4load mmc ${mmcdev}:1 0x12000000 /boot/${kernel_file}; then " \ "echo Kernel image patition area loader; " \ "echo ; " \ "else " \ - "mmc read 0x12000000 1000 4000; " \ + "mmc read 0x12000000 3000 3800; " \ "echo Kernel image raw area loader; " \ "echo ; " \ "fi; " \ @@ -236,8 +239,10 @@ "echo ; " \ "fi; " \ "bootm 0x12000000 - 0x11F00000; \0" \ - "fw=env default -a; saveenv; setenv mmcdev 1; run bootcmd; \0" \ - "bootcmd=run bootargs_ram bootload\0" + "bootload_fw=mmc dev 1; mmc read 0x11F00000 2C00 100; mmc read 0x12000000 3000 3800; mmc read 0x1E000000 7000 10000; bootm 0x12000000 - 0x11F00000; \0" \ + "fw=env default -a; saveenv; setenv mmcdev 1; run bootcmd_fw; \0" \ + "bootcmd_fw=run bootargs_ram bootload_fw \0" \ + "bootcmd=run bootargs_mmc bootload\0" /* Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP