Commit 6f95b12697c6f1fa203cf4dc97ccacccae3bbd8f

Authored by larche
1 parent 807ad2be69
Exists in master and in 2 other branches fhd, fhd-demo

= Fusing SD 제작 추가 및 관련부분 수정

bootloader/u-boot_2015_04/include/configs/mx6s_prime_oven.h
@@ -185,7 +185,7 @@ @@ -185,7 +185,7 @@
185 "loadaddr=0x12000000\0" \ 185 "loadaddr=0x12000000\0" \
186 "boot_fdt=try\0" \ 186 "boot_fdt=try\0" \
187 "bootdelay=1\0" \ 187 "bootdelay=1\0" \
188 - "ramargs=console=ttymxc0,115200 root=/dev/ram0 rw --no-log initrd=0x1E000000,64M ramdisk=131072\0" \" \ 188 + "ramargs=console=ttymxc0,115200 root=/dev/ram0 rw --no-log\0" \" \
189 "mmcargs=console=ttymxc0,115200 root=/dev/mmcblk3p2 rw --no-log rootfstype=ext4 rootwait\0" \ 189 "mmcargs=console=ttymxc0,115200 root=/dev/mmcblk3p2 rw --no-log rootfstype=ext4 rootwait\0" \
190 "bootargs_ram=setenv bootargs ${ramargs} ${video_lvds} ${video_vmalloc} eth0ip=${ipaddr} eth0netmask=${netmask} eth0gw=${gatewayip} ${arg_option} autorun=${autoexec}\0" \ 190 "bootargs_ram=setenv bootargs ${ramargs} ${video_lvds} ${video_vmalloc} eth0ip=${ipaddr} eth0netmask=${netmask} eth0gw=${gatewayip} ${arg_option} autorun=${autoexec}\0" \
191 "bootargs_mmc=setenv bootargs ${mmcargs} ${video_lvds} ${video_vmalloc} eth0ip=${ipaddr} eth0netmask=${netmask} eth0gw=${gatewayip} ${arg_option} autorun=${autoexec}\0" \ 191 "bootargs_mmc=setenv bootargs ${mmcargs} ${video_lvds} ${video_vmalloc} eth0ip=${ipaddr} eth0netmask=${netmask} eth0gw=${gatewayip} ${arg_option} autorun=${autoexec}\0" \
@@ -201,11 +201,11 @@ @@ -201,11 +201,11 @@
201 "video_vmalloc=fbmem=192M vmalloc=400M\0" \ 201 "video_vmalloc=fbmem=192M vmalloc=400M\0" \
202 "arg_option=fec.disable_giga=1\0" \ 202 "arg_option=fec.disable_giga=1\0" \
203 "mmcdev=0\0" \ 203 "mmcdev=0\0" \
204 - "tftpbase=prime-ovenoven\0" \" \ 204 + "tftpbase=prime_ovenoven\0" \" \
205 "uboot_file=u-boot.imx\0" \ 205 "uboot_file=u-boot.imx\0" \
206 "dtb_file=imx6s-prime-oven.dtb\0" \ 206 "dtb_file=imx6s-prime-oven.dtb\0" \
207 "kernel_file=uImage\0" \ 207 "kernel_file=uImage\0" \
208 - "ramdisk_file=ramdisk-prime_oven-128M.gz\0" \" \ 208 + "ramdisk_file=ramdisk-prime_oven.uboot\0" \" \
209 "logo_file=init.bmp\0" \ 209 "logo_file=init.bmp\0" \
210 "uboot=tftpboot 0x12000000 ${tftpbase}/${uboot_file}; mmc dev ${mmcdev}; mmc write 0x12000000 2 500; if ext4ls mmc ${mmcdev}:1 boot; then ext4write mmc ${mmcdev}:1 0x12000000 /boot/${uboot_file} ${filesize}; fi;\0" \ 210 "uboot=tftpboot 0x12000000 ${tftpbase}/${uboot_file}; mmc dev ${mmcdev}; mmc write 0x12000000 2 500; if ext4ls mmc ${mmcdev}:1 boot; then ext4write mmc ${mmcdev}:1 0x12000000 /boot/${uboot_file} ${filesize}; fi;\0" \
211 "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 "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" \
@@ -213,7 +213,7 @@ @@ -213,7 +213,7 @@
213 "ramdisk=tftpboot 0x1E000000 ${tftpbase}/${ramdisk_file}; mmc dev ${mmcdev}; mmc write 0x1E000000 7000 0x20000; if ext4ls mmc ${mmcdev}:1 boot; then ext4write mmc ${mmcdev}:1 0x1E000000 /boot/${ramdisk_file} ${filesize}; fi;\0" \ 213 "ramdisk=tftpboot 0x1E000000 ${tftpbase}/${ramdisk_file}; mmc dev ${mmcdev}; mmc write 0x1E000000 7000 0x20000; if ext4ls mmc ${mmcdev}:1 boot; then ext4write mmc ${mmcdev}:1 0x1E000000 /boot/${ramdisk_file} ${filesize}; fi;\0" \
214 "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 "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" \
215 "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 "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" \
216 - "bootram=mmc dev ${mmcdev}; mmcinfo; mmc read 0x11F00000 2C00 100; mmc read 0x12000000 3000 3800; mmc read 0x1E000000 7000 20000; bootm 0x12000000 - 0x11F00000 0x11F00000\0" \" \ 216 + "bootram=mmc dev ${mmcdev}; mmcinfo; mmc read 0x11F00000 2C00 100; mmc read 0x12000000 3000 3800; mmc read 0x1E000000 7000 20000; bootm 0x12000000 0x1E000000 0x11F00000 0x11F00000\0" \" \
217 "bootload= echo ; echo Loading a bootable image ...; mmc dev ${mmcdev}; " \ 217 "bootload= echo ; echo Loading a bootable image ...; mmc dev ${mmcdev}; " \
218 "if ext4load mmc ${mmcdev}:1 0x11F00000 /boot/${dtb_file}; then " \ 218 "if ext4load mmc ${mmcdev}:1 0x11F00000 /boot/${dtb_file}; then " \
219 "echo Device Tree image patition area loader; " \ 219 "echo Device Tree image patition area loader; " \
@@ -239,8 +239,8 @@ @@ -239,8 +239,8 @@
239 "mmc read 0x1E000000 2000 10000; " \ 239 "mmc read 0x1E000000 2000 10000; " \
240 "echo ; " \ 240 "echo ; " \
241 "fi; " \ 241 "fi; " \
242 - "bootm 0x12000000 - 0x11F00000; \0" \  
243 - "bootload_fw=mmc dev 1; mmc read 0x11F00000 2C00 100; mmc read 0x12000000 3000 3800; mmc read 0x1E000000 7000 20000; bootm 0x12000000 - 0x11F00000; \0" \ 242 + "bootm 0x12000000 0x1E000000 0x11F00000; \0" \
  243 + "bootload_fw=mmc dev 1; mmc read 0x11F00000 2C00 100; mmc read 0x12000000 3000 3800; mmc read 0x1E000000 7000 20000; bootm 0x12000000 0x1E000000 0x11F00000; \0" \
244 "fw=env default -a; saveenv; setenv mmcdev 1; setenv bootargs_ram ${bootargs_ram} fusing=1; run bootcmd_fw; \0" \ 244 "fw=env default -a; saveenv; setenv mmcdev 1; setenv bootargs_ram ${bootargs_ram} fusing=1; run bootcmd_fw; \0" \
245 "bootcmd_fw=run bootargs_ram bootload_fw \0" \ 245 "bootcmd_fw=run bootargs_ram bootload_fw \0" \
246 "bootcmd=run bootargs_mmc bootload\0" 246 "bootcmd=run bootargs_mmc bootload\0"
bootloader/u-boot_2015_04/make.sh
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 OUTPUT_DIR="../output-u-boot_2015_04" 3 OUTPUT_DIR="../output-u-boot_2015_04"
4 if [ -z "${CP_DIR}" ] 4 if [ -z "${CP_DIR}" ]
5 then 5 then
6 - CP_DIR="../../release /tftpboot/prime-oven /nfs/prime-oven" 6 + CP_DIR="../../release /tftpboot/${FA_PRODUCT} /nfs/${FA_PRODUCT}"
7 fi 7 fi
8 8
9 defconfig="imx6s_prime_oven_defconfig" 9 defconfig="imx6s_prime_oven_defconfig"
buildroot/buildroot-2016.08.1/board/falinux/common/post_image.sh
@@ -11,31 +11,20 @@ echo "BUILD_DIR: ${BUILD_DIR}" @@ -11,31 +11,20 @@ echo "BUILD_DIR: ${BUILD_DIR}"
11 echo "BINARIES_DIR: ${BINARIES_DIR}" 11 echo "BINARIES_DIR: ${BINARIES_DIR}"
12 echo ---------------------------------------------- 12 echo ----------------------------------------------
13 13
14 -IMAGE_SIZE_BYTE=`du -b ${BINARIES_DIR}/rootfs.ext2 | awk '{print $1}'`  
15 -IMAGE_SIZE=`echo ${IMAGE_SIZE_BYTE}/1024/1024 | bc`  
16 -  
17 -CP_DIR="../../release /tftpboot/prime-oven /nfs/prime-oven" 14 +CP_DIR="../../release /tftpboot/${FA_PRODUCT} /nfs/${FA_PRODUCT}"
18 TFTP_FILENAME=ramdisk 15 TFTP_FILENAME=ramdisk
19 if [ -n "${FA_PRODUCT}" ] 16 if [ -n "${FA_PRODUCT}" ]
20 then 17 then
21 TFTP_FILENAME="${TFTP_FILENAME}-${FA_PRODUCT}" 18 TFTP_FILENAME="${TFTP_FILENAME}-${FA_PRODUCT}"
22 fi 19 fi
23 -if [ -n "${IMAGE_SIZE}" ] && [ ${IMAGE_SIZE} -gt 0 ]  
24 -then  
25 - TFTP_FILENAME="${TFTP_FILENAME}-${IMAGE_SIZE}M"  
26 -fi  
27 -TFTP_FILENAME="${TFTP_FILENAME}.gz" 20 +TFTP_FILENAME="${TFTP_FILENAME}.uboot"
28 21
29 for DEST_DIR in ${CP_DIR} 22 for DEST_DIR in ${CP_DIR}
30 do 23 do
31 mkdir -p ${DEST_DIR} 24 mkdir -p ${DEST_DIR}
32 - cp ${BINARIES_DIR}/rootfs.ext2.gz ${DEST_DIR}/${TFTP_FILENAME} 25 + cp ${BINARIES_DIR}/rootfs.cpio.uboot ${DEST_DIR}/${TFTP_FILENAME}
33 if [ -f ${BINARIES_DIR}/rootfs.tar ]; then 26 if [ -f ${BINARIES_DIR}/rootfs.tar ]; then
34 cp ${BINARIES_DIR}/rootfs.tar ${DEST_DIR}/ 27 cp ${BINARIES_DIR}/rootfs.tar ${DEST_DIR}/
35 fi 28 fi
36 done 29 done
37 30
38 -#rm -Rf ${TARGET_DIR}  
39 -#find ${BUILD_DIR} -name ".stamp_target_installed" -exec rm {} \;  
40 -#find ${BUILD_DIR} -name ".stamp_staging_installed" -exec rm {} \;  
41 -  
buildroot/buildroot-2016.08.1/board/falinux/prime_oven/rootfs_overlay/etc/init.d/S83fusing
1 #!/bin/sh 1 #!/bin/sh
2 2
  3 +CMDLINE=$(cat /proc/cmdline)
3 TOOL_PATH="/root/.falinux" 4 TOOL_PATH="/root/.falinux"
4 5
5 start() { 6 start() {
buildroot/buildroot-2016.08.1/configs/imx6s_prime_oven_qt5_defconfig
@@ -74,6 +74,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_WPS=y @@ -74,6 +74,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
74 BR2_PACKAGE_WPA_SUPPLICANT_CLI=y 74 BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
75 BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO=y 75 BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO=y
76 BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y 76 BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
77 -BR2_TARGET_ROOTFS_EXT2=y  
78 -BR2_TARGET_ROOTFS_EXT2_BLOCKS=131072  
79 -BR2_TARGET_ROOTFS_EXT2_GZIP=y 77 +BR2_TARGET_ROOTFS_CPIO=y
  78 +BR2_TARGET_ROOTFS_CPIO_GZIP=y
  79 +BR2_TARGET_ROOTFS_CPIO_UIMAGE=y
  80 +BR2_PACKAGE_HOST_MKE2IMG=y
kernel/linux-imx6_3.14.28/make.sh
@@ -8,7 +8,7 @@ firmware_install="../out" @@ -8,7 +8,7 @@ firmware_install="../out"
8 8
9 if [ -z "${CP_DIR}" ] 9 if [ -z "${CP_DIR}" ]
10 then 10 then
11 - CP_DIR="../../release /tftpboot/prime-oven /nfs/prime-oven" 11 + CP_DIR="../../release /tftpboot/${FA_PRODUCT} /nfs/${FA_PRODUCT}"
12 fi 12 fi
13 13
14 image_filename="arch/arm/boot/uImage" 14 image_filename="arch/arm/boot/uImage"