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

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