From 5f752a85d2f84572c0d4c07149547120668eb858 Mon Sep 17 00:00:00 2001 From: Eddie Cai Date: Tue, 11 Sep 2018 09:18:18 +0800 Subject: [PATCH] add parameter for misc, ramdisk, distro Change-Id: I292cdda083a7e690e46f05eff23a90a7180e8001 Signed-off-by: Eddie Cai --- px30/BoardConfig.mk | 6 ++++++ px30/BoardConfig_32bit.mk | 6 ++++++ px30/BoardConfig_debian.mk | 6 ++++++ px3se/BoardConfig.mk | 6 ++++++ px3se/BoardConfig_nand.mk | 6 ++++++ rk1808/BoardConfig.mk | 6 ++++++ rk3036/BoardConfig.mk | 6 ++++++ rk3229/BoardConfig.mk | 6 ++++++ rk3288/BoardConfig.mk | 6 ++++++ rk3288/BoardConfig_debian.mk | 6 ++++++ rk3308/BoardConfig.mk | 6 ++++++ rk3308/BoardConfig_32bit.mk | 6 ++++++ rk3326/BoardConfig.mk | 6 ++++++ rk3326/BoardConfig_32bit.mk | 6 ++++++ rk3328/BoardConfig.mk | 6 ++++++ rk3328/BoardConfig_debian.mk | 6 ++++++ rk3399/BoardConfig.mk | 10 ++++++++-- rk3399/BoardConfig_debian.mk | 10 ++++++++-- 18 files changed, 112 insertions(+), 4 deletions(-) diff --git a/px30/BoardConfig.mk b/px30/BoardConfig.mk index 77e6bba..97295f4 100755 --- a/px30/BoardConfig.mk +++ b/px30/BoardConfig.mk @@ -16,6 +16,8 @@ export RK_PARAMETER=parameter-buildroot.txt export RK_CFG_BUILDROOT=rockchip_px30_64 # Recovery config export RK_CFG_RECOVERY=rockchip_px30_recovery +# ramboot config +export RK_CFG_RAMBOOT= # Pcba config export RK_CFG_PCBA=rockchip_px30_pcba # Build jobs @@ -36,3 +38,7 @@ export RK_STORAGE_TYPE=emmc export RK_OEM_DIR=oem_normal #userdata config export RK_USERDATA_DIR=userdata_normal +#misc image +export RK_MISC=wipe_all-misc.img +#choose enable distro module +export RK_DISTRO_MODULE= diff --git a/px30/BoardConfig_32bit.mk b/px30/BoardConfig_32bit.mk index 6fea05c..50518bd 100755 --- a/px30/BoardConfig_32bit.mk +++ b/px30/BoardConfig_32bit.mk @@ -16,6 +16,8 @@ export RK_PARAMETER=parameter-buildroot.txt export RK_CFG_BUILDROOT=rockchip_px30_32 # Recovery config export RK_CFG_RECOVERY=rockchip_px30_recovery +# ramboot config +export RK_CFG_RAMBOOT= # Pcba config export RK_CFG_PCBA=rockchip_px30_pcba # Build jobs @@ -36,3 +38,7 @@ export RK_STORAGE_TYPE=emmc export RK_OEM_DIR=oem_normal #userdata config export RK_USERDATA_DIR=userdata_normal +#misc image +export RK_MISC=wipe_all-misc.img +#choose enable distro module +export RK_DISTRO_MODULE= diff --git a/px30/BoardConfig_debian.mk b/px30/BoardConfig_debian.mk index 2c53660..b2cdf43 100755 --- a/px30/BoardConfig_debian.mk +++ b/px30/BoardConfig_debian.mk @@ -16,6 +16,8 @@ export RK_PARAMETER=parameter-debian.txt export RK_CFG_BUILDROOT=rockchip_px30 # Recovery config export RK_CFG_RECOVERY=rockchip_px30_recovery +# ramboot config +export RK_CFG_RAMBOOT= # Pcba config export RK_CFG_PCBA=rockchip_px30_pcba # Build jobs @@ -36,3 +38,7 @@ export RK_STORAGE_TYPE=emmc export RK_OEM_DIR=oem_normal #userdata config export RK_USERDATA_DIR=userdata_normal +#misc image +export RK_MISC=wipe_all-misc.img +#choose enable distro module +export RK_DISTRO_MODULE= diff --git a/px3se/BoardConfig.mk b/px3se/BoardConfig.mk index 3e02e3f..b8218bd 100755 --- a/px3se/BoardConfig.mk +++ b/px3se/BoardConfig.mk @@ -16,6 +16,8 @@ export RK_PARAMETER=parameter-buildroot.txt export RK_CFG_BUILDROOT=rockchip_px3se # Recovery config export RK_CFG_RECOVERY=rockchip_px3se_recovery +# ramboot config +export RK_CFG_RAMBOOT= # Pcba config export RK_CFG_PCBA=rockchip_px3se_pcba # Build jobs @@ -36,3 +38,7 @@ export RK_STORAGE_TYPE=emmc export RK_OEM_DIR=oem_normal #userdata config export RK_USERDATA_DIR=userdata_normal +#misc image +export RK_MISC=wipe_all-misc.img +#choose enable distro module +export RK_DISTRO_MODULE= diff --git a/px3se/BoardConfig_nand.mk b/px3se/BoardConfig_nand.mk index b001336..121bf94 100755 --- a/px3se/BoardConfig_nand.mk +++ b/px3se/BoardConfig_nand.mk @@ -16,6 +16,8 @@ export RK_PARAMETER=parameter-nand.txt export RK_CFG_BUILDROOT=rockchip_px3se # Recovery config export RK_CFG_RECOVERY=rockchip_px3se_recovery +# ramboot config +export RK_CFG_RAMBOOT= # Pcba config export RK_CFG_PCBA=rockchip_px3se_pcba # Build jobs @@ -36,3 +38,7 @@ export RK_STORAGE_TYPE=nand export RK_OEM_DIR=oem_empty #userdata config export RK_USERDATA_DIR=userdata_empty +#misc image +export RK_MISC=wipe_all-misc.img +#choose enable distro module +export RK_DISTRO_MODULE= diff --git a/rk1808/BoardConfig.mk b/rk1808/BoardConfig.mk index 41cd279..9cdcfc2 100755 --- a/rk1808/BoardConfig.mk +++ b/rk1808/BoardConfig.mk @@ -16,6 +16,8 @@ export RK_PARAMETER=parameter-buildroot.txt export RK_CFG_BUILDROOT=rockchip_rk1808 # Recovery config export RK_CFG_RECOVERY=rockchip_rk1808_recovery +# ramboot config +export RK_CFG_RAMBOOT= # Pcba config export RK_CFG_PCBA=rockchip_rk1808_pcba # Build jobs @@ -36,3 +38,7 @@ export RK_STORAGE_TYPE=emmc export RK_OEM_DIR=oem_normal #userdata config export RK_USERDATA_DIR=userdata_normal +#misc image +export RK_MISC=wipe_all-misc.img +#choose enable distro module +export RK_DISTRO_MODULE= diff --git a/rk3036/BoardConfig.mk b/rk3036/BoardConfig.mk index 3fc0f4d..3c64950 100755 --- a/rk3036/BoardConfig.mk +++ b/rk3036/BoardConfig.mk @@ -16,6 +16,8 @@ export RK_PARAMETER=parameter-buildroot.txt export RK_CFG_BUILDROOT=rockchip_rk3036 # Recovery config export RK_CFG_RECOVERY=rockchip_rk3036_recovery +# ramboot config +export RK_CFG_RAMBOOT= # Pcba config export RK_CFG_PCBA=rockchip_rk3036_pcba # Build jobs @@ -36,3 +38,7 @@ export RK_STORAGE_TYPE=emmc export RK_OEM_DIR=oem_normal #userdata config export RK_USERDATA_DIR=userdata_normal +#misc image +export RK_MISC=wipe_all-misc.img +#choose enable distro module +export RK_DISTRO_MODULE= diff --git a/rk3229/BoardConfig.mk b/rk3229/BoardConfig.mk index 6a51695..092a561 100755 --- a/rk3229/BoardConfig.mk +++ b/rk3229/BoardConfig.mk @@ -16,6 +16,8 @@ export RK_PARAMETER=parameter-buildroot.txt export RK_CFG_BUILDROOT=rockchip_rk3229 # Recovery config export RK_CFG_RECOVERY=rockchip_rk3229_recovery +# ramboot config +export RK_CFG_RAMBOOT= # Pcba config export RK_CFG_PCBA=rockchip_rk3229_pcba # Build jobs @@ -36,3 +38,7 @@ export RK_STORAGE_TYPE=emmc export RK_OEM_DIR=oem_normal #userdata config export RK_USERDATA_DIR=userdata_normal +#misc image +export RK_MISC=wipe_all-misc.img +#choose enable distro module +export RK_DISTRO_MODULE= diff --git a/rk3288/BoardConfig.mk b/rk3288/BoardConfig.mk index 6cdba59..394e137 100755 --- a/rk3288/BoardConfig.mk +++ b/rk3288/BoardConfig.mk @@ -16,6 +16,8 @@ export RK_PARAMETER=parameter-buildroot.txt export RK_CFG_BUILDROOT=rockchip_rk3288 # Recovery config export RK_CFG_RECOVERY=rockchip_rk3288_recovery +# ramboot config +export RK_CFG_RAMBOOT= # Pcba config export RK_CFG_PCBA=rockchip_rk3288_pcba # Build jobs @@ -36,3 +38,7 @@ export RK_STORAGE_TYPE=emmc export RK_OEM_DIR=oem_normal #userdata config export RK_USERDATA_DIR=userdata_normal +#misc image +export RK_MISC=wipe_all-misc.img +#choose enable distro module +export RK_DISTRO_MODULE= diff --git a/rk3288/BoardConfig_debian.mk b/rk3288/BoardConfig_debian.mk index 3f26b16..c9fef00 100755 --- a/rk3288/BoardConfig_debian.mk +++ b/rk3288/BoardConfig_debian.mk @@ -16,6 +16,8 @@ export RK_PARAMETER=parameter-debian.txt export RK_CFG_BUILDROOT=rockchip_rk3288 # Recovery config export RK_CFG_RECOVERY=rockchip_rk3288_recovery +# ramboot config +export RK_CFG_RAMBOOT= # Pcba config export RK_CFG_PCBA=rockchip_rk3288_pcba # Build jobs @@ -36,3 +38,7 @@ export RK_STORAGE_TYPE=emmc export RK_OEM_DIR=oem_normal #userdata config export RK_USERDATA_DIR=userdata_normal +#misc image +export RK_MISC=wipe_all-misc.img +#choose enable distro module +export RK_DISTRO_MODULE= diff --git a/rk3308/BoardConfig.mk b/rk3308/BoardConfig.mk index f3f82f1..36b78ec 100755 --- a/rk3308/BoardConfig.mk +++ b/rk3308/BoardConfig.mk @@ -16,6 +16,8 @@ export RK_PARAMETER=parameter-64bit.txt export RK_CFG_BUILDROOT=rockchip_rk3308_release # Recovery config export RK_CFG_RECOVERY=rockchip_rk3308_recovery +# ramboot config +export RK_CFG_RAMBOOT= # Pcba config export RK_CFG_PCBA=rockchip_rk3308_pcba # Build jobs @@ -37,3 +39,7 @@ export RK_OEM_DIR=oem #userdata config export RK_USERDATA_DIR=userdata_empty MIC_NUM=6 +#misc image +export RK_MISC=wipe_all-misc.img +#choose enable distro module +export RK_DISTRO_MODULE= diff --git a/rk3308/BoardConfig_32bit.mk b/rk3308/BoardConfig_32bit.mk index f6ec9cb..ffca47d 100755 --- a/rk3308/BoardConfig_32bit.mk +++ b/rk3308/BoardConfig_32bit.mk @@ -16,6 +16,8 @@ export RK_PARAMETER=parameter-32bit.txt export RK_CFG_BUILDROOT=rockchip_rk3308_32_release # Recovery config export RK_CFG_RECOVERY=rockchip_rk3308_recovery +# ramboot config +export RK_CFG_RAMBOOT= # Pcba config export RK_CFG_PCBA=rockchip_rk3308_pcba # Build jobs @@ -37,3 +39,7 @@ export RK_OEM_DIR=oem #userdata config export RK_USERDATA_DIR=userdata_empty MIC_NUM=6 +#misc image +export RK_MISC=wipe_all-misc.img +#choose enable distro module +export RK_DISTRO_MODULE= diff --git a/rk3326/BoardConfig.mk b/rk3326/BoardConfig.mk index 1932ef8..fb484e0 100755 --- a/rk3326/BoardConfig.mk +++ b/rk3326/BoardConfig.mk @@ -16,6 +16,8 @@ export RK_PARAMETER=parameter-buildroot.txt export RK_CFG_BUILDROOT=rockchip_rk3326_64 # Recovery config export RK_CFG_RECOVERY=rockchip_rk3326_recovery +# ramboot config +export RK_CFG_RAMBOOT= # Pcba config export RK_CFG_PCBA=rockchip_rk3326_pcba # Build jobs @@ -36,3 +38,7 @@ export RK_STORAGE_TYPE=emmc export RK_OEM_DIR=oem_normal #userdata config export RK_USERDATA_DIR=userdata_normal +#misc image +export RK_MISC=wipe_all-misc.img +#choose enable distro module +export RK_DISTRO_MODULE= diff --git a/rk3326/BoardConfig_32bit.mk b/rk3326/BoardConfig_32bit.mk index ea459e1..8f1613f 100755 --- a/rk3326/BoardConfig_32bit.mk +++ b/rk3326/BoardConfig_32bit.mk @@ -16,6 +16,8 @@ export RK_PARAMETER=parameter-buildroot.txt export RK_CFG_BUILDROOT=rockchip_rk3326_32 # Recovery config export RK_CFG_RECOVERY=rockchip_rk3326_recovery +# ramboot config +export RK_CFG_RAMBOOT= # Pcba config export RK_CFG_PCBA=rockchip_rk3326_pcba # Build jobs @@ -36,3 +38,7 @@ export RK_STORAGE_TYPE=emmc export RK_OEM_DIR=oem_normal #userdata config export RK_USERDATA_DIR=userdata_normal +#misc image +export RK_MISC=wipe_all-misc.img +#choose enable distro module +export RK_DISTRO_MODULE= diff --git a/rk3328/BoardConfig.mk b/rk3328/BoardConfig.mk index 33dc859..7938639 100755 --- a/rk3328/BoardConfig.mk +++ b/rk3328/BoardConfig.mk @@ -16,6 +16,8 @@ export RK_PARAMETER=parameter-buildroot.txt export RK_CFG_BUILDROOT=rockchip_rk3328 # Recovery config export RK_CFG_RECOVERY=rockchip_rk3328_recovery +# ramboot config +export RK_CFG_RAMBOOT= # Pcba config export RK_CFG_PCBA=rockchip_rk3328_pcba # Build jobs @@ -36,3 +38,7 @@ export RK_STORAGE_TYPE=emmc export RK_OEM_DIR=oem_normal #userdata config export RK_USERDATA_DIR=userdata_normal +#misc image +export RK_MISC=wipe_all-misc.img +#choose enable distro module +export RK_DISTRO_MODULE= diff --git a/rk3328/BoardConfig_debian.mk b/rk3328/BoardConfig_debian.mk index 03e4053..9f05025 100755 --- a/rk3328/BoardConfig_debian.mk +++ b/rk3328/BoardConfig_debian.mk @@ -16,6 +16,8 @@ export RK_PARAMETER=parameter-debian.txt export RK_CFG_BUILDROOT=rockchip_rk3328 # Recovery config export RK_CFG_RECOVERY=rockchip_rk3328_recovery +# ramboot config +export RK_CFG_RAMBOOT= # Pcba config export RK_CFG_PCBA=rockchip_rk3328_pcba # Build jobs @@ -36,3 +38,7 @@ export RK_STORAGE_TYPE=emmc export RK_OEM_DIR=oem_normal #userdata config export RK_USERDATA_DIR=userdata_normal +#misc image +export RK_MISC=wipe_all-misc.img +#choose enable distro module +export RK_DISTRO_MODULE= diff --git a/rk3399/BoardConfig.mk b/rk3399/BoardConfig.mk index e50d972..8f1661f 100755 --- a/rk3399/BoardConfig.mk +++ b/rk3399/BoardConfig.mk @@ -3,11 +3,11 @@ # Target arch export RK_ARCH=arm64 # Uboot defconfig -export RK_UBOOT_DEFCONFIG=evb-rk3399 +export RK_UBOOT_DEFCONFIG=rk3399 # Kernel defconfig export RK_KERNEL_DEFCONFIG=rockchip_linux_defconfig # Kernel dts -export RK_KERNEL_DTS=rk3399-sapphire-excavator-linux +export RK_KERNEL_DTS=rk3399-rock960-ab # boot image type export RK_BOOT_IMG=boot.img # parameter for GPT table @@ -16,6 +16,8 @@ export RK_PARAMETER=parameter-buildroot.txt export RK_CFG_BUILDROOT=rockchip_rk3399 # Recovery config export RK_CFG_RECOVERY=rockchip_rk3399_recovery +# ramboot config +export RK_CFG_RAMBOOT= # Pcba config export RK_CFG_PCBA=rockchip_rk3399_pcba # Build jobs @@ -36,3 +38,7 @@ export RK_STORAGE_TYPE=emmc export RK_OEM_DIR=oem_normal #userdata config export RK_USERDATA_DIR=userdata_normal +#misc image +export RK_MISC=wipe_all-misc.img +#choose enable distro module +export RK_DISTRO_MODULE= diff --git a/rk3399/BoardConfig_debian.mk b/rk3399/BoardConfig_debian.mk index 0ba2941..1bc993d 100755 --- a/rk3399/BoardConfig_debian.mk +++ b/rk3399/BoardConfig_debian.mk @@ -16,6 +16,8 @@ export RK_PARAMETER=parameter-debian.txt export RK_CFG_BUILDROOT=rockchip_rk3399 # Recovery config export RK_CFG_RECOVERY=rockchip_rk3399_recovery +# ramdisk config +export RK_CFG_RAMDISK= # Pcba config export RK_CFG_PCBA=rockchip_rk3399_pcba # Build jobs @@ -26,6 +28,8 @@ export RK_TARGET_PRODUCT=rk3399 export RK_ROOTFS_TYPE=ext4 # rootfs image path export RK_ROOTFS_IMG=distro/rootfs.img +# ramdisk image path +export RK_RAMDISK_IMG= # Set oem partition type, including ext2 squashfs export RK_OEM_FS_TYPE=ext2 # Set userdata partition type, including ext2, fat @@ -36,5 +40,7 @@ export RK_STORAGE_TYPE=emmc export RK_OEM_DIR=oem_normal #userdata config export RK_USERDATA_DIR=userdata_normal -#choose enable module -export RK_ENABLE_MODULE="--wifi --audio" +#misc image +export RK_MISC=wipe_all-misc.img +#choose enable distro module +export RK_DISTRO_MODULE="--wifi --audio"