From bc09904bc229a2228a356155bd63c38943c99f4d Mon Sep 17 00:00:00 2001 From: Trevor Woerner Date: Tue, 7 May 2019 10:00:47 -0400 Subject: [PATCH] classes/rockchip-gpt-img.bbclass: cleanup GPTIMG_APPEND Put MACHINE-specific tweaks into MACHINE configuration. Signed-off-by: Trevor Woerner --- classes/rockchip-gpt-img.bbclass | 1 - conf/machine/firefly-rk3288.conf | 1 + conf/machine/tinker-rk3288.conf | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/rockchip-gpt-img.bbclass b/classes/rockchip-gpt-img.bbclass index 123b56b..5e545bf 100644 --- a/classes/rockchip-gpt-img.bbclass +++ b/classes/rockchip-gpt-img.bbclass @@ -20,7 +20,6 @@ MINILOADER = "loader.bin" UBOOT = "u-boot.out" TRUST = "trust.out" GPTIMG_APPEND ?= "console=tty1 console=ttyS2,115200n8 rw root=/dev/mmcblk2p7 rootfstype=ext4 init=/sbin/init" -GPTIMG_APPEND_tinker-rk3288 = "console=tty1 console=ttyS2,115200n8 rw root=/dev/mmcblk0p7 rootfstype=ext4 init=/sbin/init" # default partitions [in Sectors] # More info at http://rockchip.wikidot.com/partitions diff --git a/conf/machine/firefly-rk3288.conf b/conf/machine/firefly-rk3288.conf index 0fbac06..0900440 100644 --- a/conf/machine/firefly-rk3288.conf +++ b/conf/machine/firefly-rk3288.conf @@ -10,3 +10,4 @@ require conf/machine/include/rk3288.inc KERNEL_DEVICETREE = "rk3288-firefly.dtb" UBOOT_MACHINE = "firefly-rk3288_defconfig" +GPTIMG_APPEND = "console=tty1 console=ttyS2,115200n8 rw root=/dev/mmcblk0p7 rootfstype=ext4 init=/sbin/init" diff --git a/conf/machine/tinker-rk3288.conf b/conf/machine/tinker-rk3288.conf index 294bdc7..9e23f8d 100644 --- a/conf/machine/tinker-rk3288.conf +++ b/conf/machine/tinker-rk3288.conf @@ -9,3 +9,4 @@ require conf/machine/include/rk3288.inc KERNEL_DEVICETREE = "rk3288-tinker.dtb" UBOOT_MACHINE = "tinker-rk3288_defconfig" +GPTIMG_APPEND = "console=tty1 console=ttyS2,115200n8 rw root=/dev/mmcblk0p7 rootfstype=ext4 init=/sbin/init"