에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 0cfc5671db553789d3cac4cede27a7de3817f811

Authored by 장형기
1 parent 2256f173d5
Exists in master and in 2 other branches fhd, fhd-demo

u-boot auto logo output

Showing 4 changed files with 35 additions and 18 deletions   Show diff stats
@@ -144,4 +144,12 @@ @@ -144,4 +144,12 @@
144 192-MB 128-MB partition#2, ext4 : APP 144 192-MB 128-MB partition#2, ext4 : APP
145 320-MB all partition#3, ext4 : DATA 145 320-MB all partition#3, ext4 : DATA
146 146
147 - 147 + ------------------------------------------
  148 + 00-MB 64-MB reserved area
  149 + ------------------------------------------
  150 + start size start size
  151 + U-boot : 1KB 640KB ( 0x2 0x500 )
  152 + Logo : 1MB 4.5MB ( 0x800 0x2400 )
  153 + DTB : 5.5MB 128KB ( 0x2C00 0x100 )
  154 + KERNEL : 6MB 7MB ( 0x3000 0x3800 )
  155 + RAMDISK : 14MB 32MB ( 0x7000 0x10000 )
bootloader/u-boot_2015_04/board/falinux/mx6s_prime_oven/mx6s_prime_oven.c
  Diff comments   View file @0cfc567
@@ -624,6 +624,10 @@ static const struct boot_mode board_boot_modes[] = { @@ -624,6 +624,10 @@ static const struct boot_mode board_boot_modes[] = {
624 624
625 int misc_init_r(void) 625 int misc_init_r(void)
626 { 626 {
  627 + /* LOGO Image output... */
  628 + run_command("run loadsplash", 0);
  629 +
  630 + /* setup gpio */
627 setup_gpio(); 631 setup_gpio();
628 632
629 #ifdef CONFIG_CMD_BMODE 633 #ifdef CONFIG_CMD_BMODE
@@ -631,5 +635,6 @@ int misc_init_r(void) @@ -631,5 +635,6 @@ int misc_init_r(void)
631 #endif 635 #endif
632 setenv_hex("reset_cause", get_imx_reset_cause()); 636 setenv_hex("reset_cause", get_imx_reset_cause());
633 637
  638 +
634 return 0; 639 return 0;
635 } 640 }
bootloader/u-boot_2015_04/include/common.h
  Diff comments   View file @0cfc567
@@ -88,7 +88,6 @@ typedef volatile unsigned char vu_char; @@ -88,7 +88,6 @@ typedef volatile unsigned char vu_char;
88 #define CONFIG_SYS_SUPPORT_64BIT_DATA 88 #define CONFIG_SYS_SUPPORT_64BIT_DATA
89 #endif 89 #endif
90 90
91 -  
92 //#define DEBUG 91 //#define DEBUG
93 92
94 #ifdef DEBUG 93 #ifdef DEBUG
bootloader/u-boot_2015_04/include/configs/mx6s_prime_oven.h
  Diff comments   View file @0cfc567
@@ -115,29 +115,28 @@ @@ -115,29 +115,28 @@
115 #define CONFIG_CMD_SETEXPR 115 #define CONFIG_CMD_SETEXPR
116 116
117 /* Framebuffer and LCD */ 117 /* Framebuffer and LCD */
118 -#if 1  
119 -#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE 118 +#if 0
  119 +#define CONFIG_VIDEO_LOGO
120 #endif 120 #endif
121 #define CONFIG_VIDEO 121 #define CONFIG_VIDEO
122 #define CONFIG_VIDEO_IPUV3 122 #define CONFIG_VIDEO_IPUV3
123 #define CONFIG_CFB_CONSOLE 123 #define CONFIG_CFB_CONSOLE
124 #define CONFIG_VGA_AS_SINGLE_DEVICE 124 #define CONFIG_VGA_AS_SINGLE_DEVICE
125 #define CONFIG_SYS_CONSOLE_IS_IN_ENV 125 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
  126 +#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
126 #define CONFIG_VIDEO_BMP_RLE8 127 #define CONFIG_VIDEO_BMP_RLE8
127 #define CONFIG_SPLASH_SCREEN 128 #define CONFIG_SPLASH_SCREEN
128 #define CONFIG_SPLASH_SCREEN_ALIGN 129 #define CONFIG_SPLASH_SCREEN_ALIGN
129 #define CONFIG_BMP_16BPP 130 #define CONFIG_BMP_16BPP
130 131
131 -#define CONFIG_VIDEO_LOGO 132 +#define CONFIG_CMD_BMP
132 #define CONFIG_VIDEO_BMP_LOGO 133 #define CONFIG_VIDEO_BMP_LOGO
133 -#define CONFIG_IPUV3_CLK 198000000 // 260000000 134 +#define CONFIG_IPUV3_CLK 260000000
134 #define CONFIG_IMX_VIDEO_SKIP 135 #define CONFIG_IMX_VIDEO_SKIP
135 136
136 -#define CONFIG_CMD_BMP  
137 - 137 +/* PWM */
138 #define CONFIG_PWM_IMX 138 #define CONFIG_PWM_IMX
139 -#define CONFIG_IMX6_PWM_PER_CLK 66000000  
140 - 139 +#define CONFIG_IMX6_PWM_PER_CLK 66000000
141 140
142 /* allow to overwrite serial and ethaddr */ 141 /* allow to overwrite serial and ethaddr */
143 #define CONFIG_ENV_OVERWRITE 142 #define CONFIG_ENV_OVERWRITE
@@ -196,7 +195,8 @@ @@ -196,7 +195,8 @@
196 "netmask=255.255.0.0\0" \ 195 "netmask=255.255.0.0\0" \
197 "gatewayip=192.168.10.1\0" \ 196 "gatewayip=192.168.10.1\0" \
198 "ip_dyn=yes\0" \ 197 "ip_dyn=yes\0" \
199 - "video_lvds=video=mxcfb0:dev=ldb,LDB-LP133WD2,if=RGB666 ldb=spl0\0" \ 198 + "panel=LDB-LP133WD2\0" \
  199 + "video_lvds=video=mxcfb0:dev=ldb,${panel},if=RGB666 ldb=spl0\0" \
200 "video_vmalloc=fbmem=192M vmalloc=400M\0" \ 200 "video_vmalloc=fbmem=192M vmalloc=400M\0" \
201 "arg_option=fec.disable_giga=1\0" \ 201 "arg_option=fec.disable_giga=1\0" \
202 "mmcdev=0\0" \ 202 "mmcdev=0\0" \
@@ -205,25 +205,28 @@ @@ -205,25 +205,28 @@
205 "dtb_file=imx6s-prime-oven.dtb\0" \ 205 "dtb_file=imx6s-prime-oven.dtb\0" \
206 "kernel_file=uImage\0" \ 206 "kernel_file=uImage\0" \
207 "ramdisk_file=ramdisk-prime_oven-64M.gz\0" \ 207 "ramdisk_file=ramdisk-prime_oven-64M.gz\0" \
  208 + "logo_file=init.bmp\0" \
208 "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" \ 209 "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" \
209 - "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" \  
210 - "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" \ 210 + "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" \
  211 + "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" \
211 "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" \ 212 "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" \
212 - "bootram=mmc dev ${mmcdev}; mmcinfo; mmc read 0x11F00000 A00 100; mmc read 0x12000000 1000 4000; mmc read 0x1E000000 7000 10000; bootm 0x12000000 - 0x11F00000\0" \ 213 + "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" \
  214 + "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" \
  215 + "bootram=mmc dev ${mmcdev}; mmcinfo; mmc read 0x11F00000 2C00 100; mmc read 0x12000000 3000 3800; mmc read 0x1E000000 7000 10000; bootm 0x12000000 - 0x11F00000\0" \
213 "bootload= echo ; echo Loading a bootable image ...; mmc dev ${mmcdev}; " \ 216 "bootload= echo ; echo Loading a bootable image ...; mmc dev ${mmcdev}; " \
214 "if ext4load mmc ${mmcdev}:1 0x11F00000 /boot/${dtb_file}; then " \ 217 "if ext4load mmc ${mmcdev}:1 0x11F00000 /boot/${dtb_file}; then " \
215 "echo Device Tree image patition area loader; " \ 218 "echo Device Tree image patition area loader; " \
216 "echo ; " \ 219 "echo ; " \
217 "else " \ 220 "else " \
218 "echo Device Tree image raw area loader; " \ 221 "echo Device Tree image raw area loader; " \
219 - "mmc read 0x11F00000 A00 100; " \ 222 + "mmc read 0x11F00000 2C00 100; " \
220 "echo ; " \ 223 "echo ; " \
221 "fi; " \ 224 "fi; " \
222 "if ext4load mmc ${mmcdev}:1 0x12000000 /boot/${kernel_file}; then " \ 225 "if ext4load mmc ${mmcdev}:1 0x12000000 /boot/${kernel_file}; then " \
223 "echo Kernel image patition area loader; " \ 226 "echo Kernel image patition area loader; " \
224 "echo ; " \ 227 "echo ; " \
225 "else " \ 228 "else " \
226 - "mmc read 0x12000000 1000 4000; " \ 229 + "mmc read 0x12000000 3000 3800; " \
227 "echo Kernel image raw area loader; " \ 230 "echo Kernel image raw area loader; " \
228 "echo ; " \ 231 "echo ; " \
229 "fi; " \ 232 "fi; " \
@@ -236,8 +239,10 @@ @@ -236,8 +239,10 @@
236 "echo ; " \ 239 "echo ; " \
237 "fi; " \ 240 "fi; " \
238 "bootm 0x12000000 - 0x11F00000; \0" \ 241 "bootm 0x12000000 - 0x11F00000; \0" \
239 - "fw=env default -a; saveenv; setenv mmcdev 1; run bootcmd; \0" \  
240 - "bootcmd=run bootargs_ram bootload\0" 242 + "bootload_fw=mmc dev 1; mmc read 0x11F00000 2C00 100; mmc read 0x12000000 3000 3800; mmc read 0x1E000000 7000 10000; bootm 0x12000000 - 0x11F00000; \0" \
  243 + "fw=env default -a; saveenv; setenv mmcdev 1; run bootcmd_fw; \0" \
  244 + "bootcmd_fw=run bootargs_ram bootload_fw \0" \
  245 + "bootcmd=run bootargs_mmc bootload\0"
241 246
242 /* Miscellaneous configurable options */ 247 /* Miscellaneous configurable options */
243 #define CONFIG_SYS_LONGHELP 248 #define CONFIG_SYS_LONGHELP