에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 5749fe1914dfe1d2b3b7b6a68d88a6a61fe66625

Authored by 김민수
1 parent c85b2b79d4
Exists in master and in 2 other branches fhd, fhd-demo

생산 스크립트 수정

Showing 4 changed files with 40 additions and 18 deletions   Show diff stats
buildroot/buildroot-2016.08.1/board/falinux/prime_oven/rootfs_overlay/root/.falinux/mk-emmc-fusing.sh
  Diff comments   View file @5749fe1
@@ -17,10 +17,13 @@ FNAME_DTB="imx6s-prime-oven.dtb" @@ -17,10 +17,13 @@ FNAME_DTB="imx6s-prime-oven.dtb"
17 FNAME_KERNEL="uImage" 17 FNAME_KERNEL="uImage"
18 FNAME_FSCPIO="ramdisk-prime_oven.uboot" 18 FNAME_FSCPIO="ramdisk-prime_oven.uboot"
19 FNAME_RFS="rootfs.tar" 19 FNAME_RFS="rootfs.tar"
  20 +FNAME_APP="application.tar"
20 21
21 SD_MOUNT_PATH_P1="/tmp/mmcblk2p1" 22 SD_MOUNT_PATH_P1="/tmp/mmcblk2p1"
22 EMMC_MOUNT_PATH_P1="/tmp/mmcblk3p1" 23 EMMC_MOUNT_PATH_P1="/tmp/mmcblk3p1"
23 EMMC_MOUNT_PATH_P2="/tmp/mmcblk3p2" 24 EMMC_MOUNT_PATH_P2="/tmp/mmcblk3p2"
  25 +EMMC_MOUNT_PATH_P3="/tmp/mmcblk3p3"
  26 +EMMC_MOUNT_PATH_P4="/tmp/mmcblk3p4"
24 27
25 function Init_Unmount() 28 function Init_Unmount()
26 { 29 {
@@ -95,9 +98,19 @@ function run_mount() @@ -95,9 +98,19 @@ function run_mount()
95 mkdir ${EMMC_MOUNT_PATH_P2} 98 mkdir ${EMMC_MOUNT_PATH_P2}
96 fi 99 fi
97 100
  101 + if [ ! -d ${EMMC_MOUNT_PATH_P3} ]; then
  102 + mkdir ${EMMC_MOUNT_PATH_P3}
  103 + fi
  104 +
  105 + if [ ! -d ${EMMC_MOUNT_PATH_P4} ]; then
  106 + mkdir ${EMMC_MOUNT_PATH_P4}
  107 + fi
  108 +
98 mount -t ext4 ${SD_DEV_PATH}${PART1} ${SD_MOUNT_PATH_P1} 109 mount -t ext4 ${SD_DEV_PATH}${PART1} ${SD_MOUNT_PATH_P1}
99 mount -t ext3 ${EMMC_DEV_PATH}${PART1} ${EMMC_MOUNT_PATH_P1} 110 mount -t ext3 ${EMMC_DEV_PATH}${PART1} ${EMMC_MOUNT_PATH_P1}
100 mount -t ext4 ${EMMC_DEV_PATH}${PART2} ${EMMC_MOUNT_PATH_P2} 111 mount -t ext4 ${EMMC_DEV_PATH}${PART2} ${EMMC_MOUNT_PATH_P2}
  112 + mount -t ext4 ${EMMC_DEV_PATH}${PART3} ${EMMC_MOUNT_PATH_P3}
  113 + mount -t ext4 ${EMMC_DEV_PATH}${PART4} ${EMMC_MOUNT_PATH_P4}
101 } 114 }
102 115
103 function run_copy_image() 116 function run_copy_image()
@@ -129,6 +142,9 @@ function run_copy_rootfs() @@ -129,6 +142,9 @@ function run_copy_rootfs()
129 tar -xf ${SD_MOUNT_PATH_P1}/boot/${FNAME_RFS} -C ${EMMC_MOUNT_PATH_P2} 142 tar -xf ${SD_MOUNT_PATH_P1}/boot/${FNAME_RFS} -C ${EMMC_MOUNT_PATH_P2}
130 143
131 cp /etc/ssh/ssh_host_ed25519_key ${EMMC_MOUNT_PATH_P2}/etc/ssh/ 144 cp /etc/ssh/ssh_host_ed25519_key ${EMMC_MOUNT_PATH_P2}/etc/ssh/
  145 +
  146 + tar -xf ${SD_MOUNT_PATH_P1}/boot/${FNAME_APP} ${EMMC_MOUNT_PATH_P3}/
  147 + tar -xf ${SD_MOUNT_PATH_P1}/boot/${FNAME_APP} ${EMMC_MOUNT_PATH_P4}/
132 } 148 }
133 149
134 function run_raw_write() 150 function run_raw_write()
@@ -153,6 +169,8 @@ function run_umount() @@ -153,6 +169,8 @@ function run_umount()
153 umount ${SD_MOUNT_PATH_P1} 169 umount ${SD_MOUNT_PATH_P1}
154 umount ${EMMC_MOUNT_PATH_P1} 170 umount ${EMMC_MOUNT_PATH_P1}
155 umount ${EMMC_MOUNT_PATH_P2} 171 umount ${EMMC_MOUNT_PATH_P2}
  172 + umount ${EMMC_MOUNT_PATH_P3}
  173 + umount ${EMMC_MOUNT_PATH_P4}
156 } 174 }
157 175
158 176
release/mk-fusingsd.sh
  Diff comments   View file @5749fe1
@@ -5,7 +5,6 @@ C_LRED='\033[1;31m' @@ -5,7 +5,6 @@ C_LRED='\033[1;31m'
5 5
6 #### Partition Number #### 6 #### Partition Number ####
7 P1_NUM="1" 7 P1_NUM="1"
8 -P2_NUM="2"  
9 8
10 DEVNAME="mmcblk0" 9 DEVNAME="mmcblk0"
11 DEV_PATH="/dev/mmcblk0" 10 DEV_PATH="/dev/mmcblk0"
@@ -18,6 +17,7 @@ FNAME_DTB="imx6s-prime-oven.dtb" @@ -18,6 +17,7 @@ FNAME_DTB="imx6s-prime-oven.dtb"
18 FNAME_KERNEL="uImage" 17 FNAME_KERNEL="uImage"
19 FNAME_FSCPIO="ramdisk-prime_oven.uboot" 18 FNAME_FSCPIO="ramdisk-prime_oven.uboot"
20 FNAME_RFS="rootfs.tar" 19 FNAME_RFS="rootfs.tar"
  20 +FNAME_APP="application.tar"
21 21
22 MOUNT_PATH_P1="/tmp/mmcblk0p1" 22 MOUNT_PATH_P1="/tmp/mmcblk0p1"
23 23
@@ -33,11 +33,6 @@ n @@ -33,11 +33,6 @@ n
33 p 33 p
34 1 34 1
35 262144 35 262144
36 -1310719  
37 -n  
38 -p  
39 -2  
40 -1310720  
41 36
42 p 37 p
43 w 38 w
@@ -50,7 +45,6 @@ function run_format() @@ -50,7 +45,6 @@ function run_format()
50 echo -e "${C_LRED}### Format SDCARD - run_format() ###${C_NC}" 45 echo -e "${C_LRED}### Format SDCARD - run_format() ###${C_NC}"
51 echo "" 46 echo ""
52 echo "y" | mkfs.ext4 ${DEV_PATH}${P1_NUM} -L BOOT0 47 echo "y" | mkfs.ext4 ${DEV_PATH}${P1_NUM} -L BOOT0
53 - echo "y" | mkfs.ext4 ${DEV_PATH}${P2_NUM} -L DATA  
54 } 48 }
55 49
56 function run_mount() 50 function run_mount()
@@ -88,6 +82,7 @@ function run_copy_image() @@ -88,6 +82,7 @@ function run_copy_image()
88 cp -v ./$FNAME_KERNEL ${MOUNT_PATH_P1}/boot/ 82 cp -v ./$FNAME_KERNEL ${MOUNT_PATH_P1}/boot/
89 cp -v ./$FNAME_FSCPIO ${MOUNT_PATH_P1}/boot/ 83 cp -v ./$FNAME_FSCPIO ${MOUNT_PATH_P1}/boot/
90 cp -v ./$FNAME_RFS ${MOUNT_PATH_P1}/boot/ 84 cp -v ./$FNAME_RFS ${MOUNT_PATH_P1}/boot/
  85 + cp -v ./$FNAME_APP ${MOUNT_PATH_P1}/boot/
91 sleep 1 86 sleep 1
92 sync 87 sync
93 } 88 }
@@ -134,7 +129,6 @@ function main() @@ -134,7 +129,6 @@ function main()
134 if [[ "$1" == "sd"* ]]; then 129 if [[ "$1" == "sd"* ]]; then
135 if [ "$1" != "sd" ]; then 130 if [ "$1" != "sd" ]; then
136 P1_NUM="1" 131 P1_NUM="1"
137 - P2_NUM="2"  
138 else 132 else
139 echo "Missing Partition Number" 133 echo "Missing Partition Number"
140 exit 134 exit
@@ -143,7 +137,6 @@ if [[ "$1" == "sd"* ]]; then @@ -143,7 +137,6 @@ if [[ "$1" == "sd"* ]]; then
143 elif [[ "$1" == "mmcblk"* ]]; then 137 elif [[ "$1" == "mmcblk"* ]]; then
144 if [ "$1" != "mmcblk" ]; then 138 if [ "$1" != "mmcblk" ]; then
145 P1_NUM="p1" 139 P1_NUM="p1"
146 - P2_NUM="p2"  
147 else 140 else
148 echo "Missing Partition Number" 141 echo "Missing Partition Number"
149 exit 142 exit
scripts/mk-emmc-fusing.sh
  Diff comments   View file @5749fe1
@@ -17,10 +17,13 @@ FNAME_DTB="imx6s-prime-oven.dtb" @@ -17,10 +17,13 @@ FNAME_DTB="imx6s-prime-oven.dtb"
17 FNAME_KERNEL="uImage" 17 FNAME_KERNEL="uImage"
18 FNAME_FSCPIO="ramdisk-prime_oven.uboot" 18 FNAME_FSCPIO="ramdisk-prime_oven.uboot"
19 FNAME_RFS="rootfs.tar" 19 FNAME_RFS="rootfs.tar"
  20 +FNAME_APP="application.tar"
20 21
21 SD_MOUNT_PATH_P1="/tmp/mmcblk2p1" 22 SD_MOUNT_PATH_P1="/tmp/mmcblk2p1"
22 EMMC_MOUNT_PATH_P1="/tmp/mmcblk3p1" 23 EMMC_MOUNT_PATH_P1="/tmp/mmcblk3p1"
23 EMMC_MOUNT_PATH_P2="/tmp/mmcblk3p2" 24 EMMC_MOUNT_PATH_P2="/tmp/mmcblk3p2"
  25 +EMMC_MOUNT_PATH_P3="/tmp/mmcblk3p3"
  26 +EMMC_MOUNT_PATH_P4="/tmp/mmcblk3p4"
24 27
25 function Init_Unmount() 28 function Init_Unmount()
26 { 29 {
@@ -95,9 +98,19 @@ function run_mount() @@ -95,9 +98,19 @@ function run_mount()
95 mkdir ${EMMC_MOUNT_PATH_P2} 98 mkdir ${EMMC_MOUNT_PATH_P2}
96 fi 99 fi
97 100
  101 + if [ ! -d ${EMMC_MOUNT_PATH_P3} ]; then
  102 + mkdir ${EMMC_MOUNT_PATH_P3}
  103 + fi
  104 +
  105 + if [ ! -d ${EMMC_MOUNT_PATH_P4} ]; then
  106 + mkdir ${EMMC_MOUNT_PATH_P4}
  107 + fi
  108 +
98 mount -t ext4 ${SD_DEV_PATH}${PART1} ${SD_MOUNT_PATH_P1} 109 mount -t ext4 ${SD_DEV_PATH}${PART1} ${SD_MOUNT_PATH_P1}
99 mount -t ext3 ${EMMC_DEV_PATH}${PART1} ${EMMC_MOUNT_PATH_P1} 110 mount -t ext3 ${EMMC_DEV_PATH}${PART1} ${EMMC_MOUNT_PATH_P1}
100 mount -t ext4 ${EMMC_DEV_PATH}${PART2} ${EMMC_MOUNT_PATH_P2} 111 mount -t ext4 ${EMMC_DEV_PATH}${PART2} ${EMMC_MOUNT_PATH_P2}
  112 + mount -t ext4 ${EMMC_DEV_PATH}${PART3} ${EMMC_MOUNT_PATH_P3}
  113 + mount -t ext4 ${EMMC_DEV_PATH}${PART4} ${EMMC_MOUNT_PATH_P4}
101 } 114 }
102 115
103 function run_copy_image() 116 function run_copy_image()
@@ -129,6 +142,9 @@ function run_copy_rootfs() @@ -129,6 +142,9 @@ function run_copy_rootfs()
129 tar -xf ${SD_MOUNT_PATH_P1}/boot/${FNAME_RFS} -C ${EMMC_MOUNT_PATH_P2} 142 tar -xf ${SD_MOUNT_PATH_P1}/boot/${FNAME_RFS} -C ${EMMC_MOUNT_PATH_P2}
130 143
131 cp /etc/ssh/ssh_host_ed25519_key ${EMMC_MOUNT_PATH_P2}/etc/ssh/ 144 cp /etc/ssh/ssh_host_ed25519_key ${EMMC_MOUNT_PATH_P2}/etc/ssh/
  145 +
  146 + tar -xf ${SD_MOUNT_PATH_P1}/boot/${FNAME_APP} ${EMMC_MOUNT_PATH_P3}/
  147 + tar -xf ${SD_MOUNT_PATH_P1}/boot/${FNAME_APP} ${EMMC_MOUNT_PATH_P4}/
132 } 148 }
133 149
134 function run_raw_write() 150 function run_raw_write()
@@ -153,6 +169,8 @@ function run_umount() @@ -153,6 +169,8 @@ function run_umount()
153 umount ${SD_MOUNT_PATH_P1} 169 umount ${SD_MOUNT_PATH_P1}
154 umount ${EMMC_MOUNT_PATH_P1} 170 umount ${EMMC_MOUNT_PATH_P1}
155 umount ${EMMC_MOUNT_PATH_P2} 171 umount ${EMMC_MOUNT_PATH_P2}
  172 + umount ${EMMC_MOUNT_PATH_P3}
  173 + umount ${EMMC_MOUNT_PATH_P4}
156 } 174 }
157 175
158 176
scripts/mk-fusingsd.sh
  Diff comments   View file @5749fe1
@@ -5,7 +5,6 @@ C_LRED='\033[1;31m' @@ -5,7 +5,6 @@ C_LRED='\033[1;31m'
5 5
6 #### Partition Number #### 6 #### Partition Number ####
7 P1_NUM="1" 7 P1_NUM="1"
8 -P2_NUM="2"  
9 8
10 DEVNAME="mmcblk0" 9 DEVNAME="mmcblk0"
11 DEV_PATH="/dev/mmcblk0" 10 DEV_PATH="/dev/mmcblk0"
@@ -18,6 +17,7 @@ FNAME_DTB="imx6s-prime-oven.dtb" @@ -18,6 +17,7 @@ FNAME_DTB="imx6s-prime-oven.dtb"
18 FNAME_KERNEL="uImage" 17 FNAME_KERNEL="uImage"
19 FNAME_FSCPIO="ramdisk-prime_oven.uboot" 18 FNAME_FSCPIO="ramdisk-prime_oven.uboot"
20 FNAME_RFS="rootfs.tar" 19 FNAME_RFS="rootfs.tar"
  20 +FNAME_APP="application.tar"
21 21
22 MOUNT_PATH_P1="/tmp/mmcblk0p1" 22 MOUNT_PATH_P1="/tmp/mmcblk0p1"
23 23
@@ -33,11 +33,6 @@ n @@ -33,11 +33,6 @@ n
33 p 33 p
34 1 34 1
35 262144 35 262144
36 -1310719  
37 -n  
38 -p  
39 -2  
40 -1310720  
41 36
42 p 37 p
43 w 38 w
@@ -50,7 +45,6 @@ function run_format() @@ -50,7 +45,6 @@ function run_format()
50 echo -e "${C_LRED}### Format SDCARD - run_format() ###${C_NC}" 45 echo -e "${C_LRED}### Format SDCARD - run_format() ###${C_NC}"
51 echo "" 46 echo ""
52 echo "y" | mkfs.ext4 ${DEV_PATH}${P1_NUM} -L BOOT0 47 echo "y" | mkfs.ext4 ${DEV_PATH}${P1_NUM} -L BOOT0
53 - echo "y" | mkfs.ext4 ${DEV_PATH}${P2_NUM} -L DATA  
54 } 48 }
55 49
56 function run_mount() 50 function run_mount()
@@ -88,6 +82,7 @@ function run_copy_image() @@ -88,6 +82,7 @@ function run_copy_image()
88 cp -v ./$FNAME_KERNEL ${MOUNT_PATH_P1}/boot/ 82 cp -v ./$FNAME_KERNEL ${MOUNT_PATH_P1}/boot/
89 cp -v ./$FNAME_FSCPIO ${MOUNT_PATH_P1}/boot/ 83 cp -v ./$FNAME_FSCPIO ${MOUNT_PATH_P1}/boot/
90 cp -v ./$FNAME_RFS ${MOUNT_PATH_P1}/boot/ 84 cp -v ./$FNAME_RFS ${MOUNT_PATH_P1}/boot/
  85 + cp -v ./$FNAME_APP ${MOUNT_PATH_P1}/boot/
91 sleep 1 86 sleep 1
92 sync 87 sync
93 } 88 }
@@ -134,7 +129,6 @@ function main() @@ -134,7 +129,6 @@ function main()
134 if [[ "$1" == "sd"* ]]; then 129 if [[ "$1" == "sd"* ]]; then
135 if [ "$1" != "sd" ]; then 130 if [ "$1" != "sd" ]; then
136 P1_NUM="1" 131 P1_NUM="1"
137 - P2_NUM="2"  
138 else 132 else
139 echo "Missing Partition Number" 133 echo "Missing Partition Number"
140 exit 134 exit
@@ -143,7 +137,6 @@ if [[ "$1" == "sd"* ]]; then @@ -143,7 +137,6 @@ if [[ "$1" == "sd"* ]]; then
143 elif [[ "$1" == "mmcblk"* ]]; then 137 elif [[ "$1" == "mmcblk"* ]]; then
144 if [ "$1" != "mmcblk" ]; then 138 if [ "$1" != "mmcblk" ]; then
145 P1_NUM="p1" 139 P1_NUM="p1"
146 - P2_NUM="p2"  
147 else 140 else
148 echo "Missing Partition Number" 141 echo "Missing Partition Number"
149 exit 142 exit