From 6f95b12697c6f1fa203cf4dc97ccacccae3bbd8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EA=B7=9C=ED=98=95?= Date: Tue, 30 May 2017 16:13:56 +0900 Subject: [PATCH] =?UTF-8?q?=3D=20Fusing=20SD=20=EC=A0=9C=EC=9E=91=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EB=B0=8F=20=EA=B4=80=EB=A0=A8=EB=B6=80?= =?UTF-8?q?=EB=B6=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../u-boot_2015_04/include/configs/mx6s_prime_oven.h | 12 ++++++------ bootloader/u-boot_2015_04/make.sh | 2 +- .../board/falinux/common/post_image.sh | 17 +++-------------- .../prime_oven/rootfs_overlay/etc/init.d/S83fusing | 1 + .../configs/imx6s_prime_oven_qt5_defconfig | 7 ++++--- kernel/linux-imx6_3.14.28/make.sh | 2 +- 6 files changed, 16 insertions(+), 25 deletions(-) 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 562f990..3b8ccdb 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 @@ -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-oven\0" \ + "tftpbase=prime_oven\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\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\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" diff --git a/bootloader/u-boot_2015_04/make.sh b/bootloader/u-boot_2015_04/make.sh index 977ea35..a94681b 100755 --- a/bootloader/u-boot_2015_04/make.sh +++ b/bootloader/u-boot_2015_04/make.sh @@ -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" diff --git a/buildroot/buildroot-2016.08.1/board/falinux/common/post_image.sh b/buildroot/buildroot-2016.08.1/board/falinux/common/post_image.sh index 511e45f..0bb13e2 100755 --- a/buildroot/buildroot-2016.08.1/board/falinux/common/post_image.sh +++ b/buildroot/buildroot-2016.08.1/board/falinux/common/post_image.sh @@ -11,31 +11,20 @@ echo "BUILD_DIR: ${BUILD_DIR}" 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 {} \; - diff --git a/buildroot/buildroot-2016.08.1/board/falinux/prime_oven/rootfs_overlay/etc/init.d/S83fusing b/buildroot/buildroot-2016.08.1/board/falinux/prime_oven/rootfs_overlay/etc/init.d/S83fusing index 0954cd7..4536178 100755 --- a/buildroot/buildroot-2016.08.1/board/falinux/prime_oven/rootfs_overlay/etc/init.d/S83fusing +++ b/buildroot/buildroot-2016.08.1/board/falinux/prime_oven/rootfs_overlay/etc/init.d/S83fusing @@ -1,5 +1,6 @@ #!/bin/sh +CMDLINE=$(cat /proc/cmdline) TOOL_PATH="/root/.falinux" start() { diff --git a/buildroot/buildroot-2016.08.1/configs/imx6s_prime_oven_qt5_defconfig b/buildroot/buildroot-2016.08.1/configs/imx6s_prime_oven_qt5_defconfig index e5484de..9e7df7d 100644 --- a/buildroot/buildroot-2016.08.1/configs/imx6s_prime_oven_qt5_defconfig +++ b/buildroot/buildroot-2016.08.1/configs/imx6s_prime_oven_qt5_defconfig @@ -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 diff --git a/kernel/linux-imx6_3.14.28/make.sh b/kernel/linux-imx6_3.14.28/make.sh index 99a1785..09b223f 100755 --- a/kernel/linux-imx6_3.14.28/make.sh +++ b/kernel/linux-imx6_3.14.28/make.sh @@ -8,7 +8,7 @@ firmware_install="../out" 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" -- 2.1.4