From e563a33262979542d55afab9d6c00211d2500d65 Mon Sep 17 00:00:00 2001 From: Caesar Wang Date: Tue, 19 May 2020 14:26:31 +0800 Subject: [PATCH] rk3288: correct the parameter Signed-off-by: Caesar Wang Change-Id: I2fa6e40fdf6b1e3d4d7e89d939ed66d4ceb10d70 --- rk3288/BoardConfig.mk | 2 +- rk3288/BoardConfig_8846.mk | 2 +- rk3288/BoardConfig_8846_debian.mk | 2 +- rk3288/BoardConfig_debian.mk | 2 +- rk3288/BoardConfig_firefly.mk | 2 +- rk3288/BoardConfig_firefly_debian.mk | 2 +- rk3288/parameter-debian.txt | 12 ------------ rk3288/{parameter-buildroot.txt => parameter.txt} | 2 +- 8 files changed, 7 insertions(+), 19 deletions(-) delete mode 100644 rk3288/parameter-debian.txt rename rk3288/{parameter-buildroot.txt => parameter.txt} (80%) diff --git a/rk3288/BoardConfig.mk b/rk3288/BoardConfig.mk index d31c82b..3507918 100755 --- a/rk3288/BoardConfig.mk +++ b/rk3288/BoardConfig.mk @@ -13,7 +13,7 @@ export RK_BOOT_IMG=zboot.img # kernel image path export RK_KERNEL_IMG=kernel/arch/arm/boot/zImage # parameter for GPT table -export RK_PARAMETER=parameter-buildroot.txt +export RK_PARAMETER=parameter.txt # Buildroot config export RK_CFG_BUILDROOT=rockchip_rk3288 # Recovery config diff --git a/rk3288/BoardConfig_8846.mk b/rk3288/BoardConfig_8846.mk index c5d5a08..f62793e 100755 --- a/rk3288/BoardConfig_8846.mk +++ b/rk3288/BoardConfig_8846.mk @@ -13,7 +13,7 @@ export RK_BOOT_IMG=zboot.img # kernel image path export RK_KERNEL_IMG=kernel/arch/arm/boot/zImage # parameter for GPT table -export RK_PARAMETER=parameter-buildroot.txt +export RK_PARAMETER=parameter.txt # Buildroot config export RK_CFG_BUILDROOT=rockchip_rk3288 # Recovery config diff --git a/rk3288/BoardConfig_8846_debian.mk b/rk3288/BoardConfig_8846_debian.mk index 677f39a..bc02b53 100755 --- a/rk3288/BoardConfig_8846_debian.mk +++ b/rk3288/BoardConfig_8846_debian.mk @@ -13,7 +13,7 @@ export RK_BOOT_IMG=zboot.img # kernel image path export RK_KERNEL_IMG=kernel/arch/arm/boot/zImage # parameter for GPT table -export RK_PARAMETER=parameter-debian.txt +export RK_PARAMETER=parameter.txt # Buildroot config export RK_CFG_BUILDROOT=rockchip_rk3288 # Recovery config diff --git a/rk3288/BoardConfig_debian.mk b/rk3288/BoardConfig_debian.mk index 69a8f9d..1d8407a 100755 --- a/rk3288/BoardConfig_debian.mk +++ b/rk3288/BoardConfig_debian.mk @@ -13,7 +13,7 @@ export RK_BOOT_IMG=zboot.img # kernel image path export RK_KERNEL_IMG=kernel/arch/arm/boot/zImage # parameter for GPT table -export RK_PARAMETER=parameter-debian.txt +export RK_PARAMETER=parameter.txt # Buildroot config export RK_CFG_BUILDROOT=rockchip_rk3288 # Recovery config diff --git a/rk3288/BoardConfig_firefly.mk b/rk3288/BoardConfig_firefly.mk index 5101309..5c05f0c 100755 --- a/rk3288/BoardConfig_firefly.mk +++ b/rk3288/BoardConfig_firefly.mk @@ -13,7 +13,7 @@ export RK_BOOT_IMG=zboot.img # kernel image path export RK_KERNEL_IMG=kernel/arch/arm/boot/zImage # parameter for GPT table -export RK_PARAMETER=parameter-buildroot.txt +export RK_PARAMETER=parameter.txt # Buildroot config export RK_CFG_BUILDROOT=rockchip_rk3288 # Recovery config diff --git a/rk3288/BoardConfig_firefly_debian.mk b/rk3288/BoardConfig_firefly_debian.mk index 5e41602..5c05f0c 100755 --- a/rk3288/BoardConfig_firefly_debian.mk +++ b/rk3288/BoardConfig_firefly_debian.mk @@ -13,7 +13,7 @@ export RK_BOOT_IMG=zboot.img # kernel image path export RK_KERNEL_IMG=kernel/arch/arm/boot/zImage # parameter for GPT table -export RK_PARAMETER=parameter-debian.txt +export RK_PARAMETER=parameter.txt # Buildroot config export RK_CFG_BUILDROOT=rockchip_rk3288 # Recovery config diff --git a/rk3288/parameter-debian.txt b/rk3288/parameter-debian.txt deleted file mode 100644 index 2eb74e2..0000000 --- a/rk3288/parameter-debian.txt +++ /dev/null @@ -1,12 +0,0 @@ -FIRMWARE_VER: 8.1 -MACHINE_MODEL:rk3288 -MACHINE_ID:007 -MANUFACTURER:RK3288 -MAGIC: 0x5041524B -ATAG: 0x00200800 -MACHINE: 3288 -CHECK_MASK: 0x80 -PWR_HLD: 0,0,A,0,1 -TYPE: GPT -CMDLINE: mtdparts=rk29xxnand:0x00002000@0x00004000(uboot),0x00002000@0x00006000(trust),0x00002000@0x00008000(misc),0x00010000@0x0000a000(boot),0x00010000@0x0001a000(recovery),0x00010000@0x0002a000(backup),0x00020000@0x0003a000(oem),0x00700000@0x0005a000(rootfs),-@0x0075a000(userdata:grow) -uuid:rootfs=614e0000-0000-4b53-8000-1d28000054a9 diff --git a/rk3288/parameter-buildroot.txt b/rk3288/parameter.txt similarity index 80% rename from rk3288/parameter-buildroot.txt rename to rk3288/parameter.txt index 260fb31..e23298c 100644 --- a/rk3288/parameter-buildroot.txt +++ b/rk3288/parameter.txt @@ -8,5 +8,5 @@ MACHINE: 3288 CHECK_MASK: 0x80 PWR_HLD: 0,0,A,0,1 TYPE: GPT -CMDLINE: mtdparts=rk29xxnand:0x00002000@0x00004000(uboot),0x00002000@0x00006000(trust),0x00002000@0x00008000(misc),0x00010000@0x0000a000(boot),0x00010000@0x0001a000(recovery),0x00010000@0x0002a000(backup),0x00020000@0x0003a000(oem),0x00100000@0x0005a000(rootfs),-@0x0015a000(userdata:grow) +CMDLINE: mtdparts=rk29xxnand:0x00002000@0x00004000(uboot),0x00002000@0x00006000(trust),0x00002000@0x00008000(misc),0x00010000@0x0000a000(boot),0x00010000@0x0001a000(recovery),0x00010000@0x0002a000(backup),0x00020000@0x0003a000(oem),0x00c00000@0x0005a000(rootfs),-@0x00c5a000(userdata:grow) uuid:rootfs=614e0000-0000-4b53-8000-1d28000054a9