From 0d7fab7da6307fd7397e4d8ac73dbf6396a537ea Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Sat, 16 Jul 2016 00:31:22 +0800 Subject: qoriq-arm.inc: move DEFAULTTUNE/UBOOT_ENTRYPOINT to ls1021atwr.conf the specific values are for ls1021atwr. Signed-off-by: Ting Liu Signed-off-by: Otavio Salvador --- conf/machine/include/qoriq-arm.inc | 4 ---- conf/machine/ls1021atwr.conf | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'conf') diff --git a/conf/machine/include/qoriq-arm.inc b/conf/machine/include/qoriq-arm.inc index 232bcbeee..e6cf675ba 100644 --- a/conf/machine/include/qoriq-arm.inc +++ b/conf/machine/include/qoriq-arm.inc @@ -1,9 +1,5 @@ require conf/machine/include/qoriq-base.inc -DEFAULTTUNE ?= "cortexa7hf-neon" - -UBOOT_ENTRYPOINT = "0x80008000" - MKUBIFS_ARGS ??= "-m 512 -e 15360 -c 3600" UBINIZE_ARGS ??= "-m 512 -p 16KiB -s 512" diff --git a/conf/machine/ls1021atwr.conf b/conf/machine/ls1021atwr.conf index eb035633d..1ba499226 100644 --- a/conf/machine/ls1021atwr.conf +++ b/conf/machine/ls1021atwr.conf @@ -8,6 +8,8 @@ require conf/machine/include/qoriq-arm.inc require conf/machine/include/tune-cortexa7.inc +DEFAULTTUNE = "cortexa7hf-neon" + SOC_FAMILY = "ls102xa" UBOOT_CONFIG ??= "sdcard-ifc sdcard-qspi lpuart qspi secure-boot nor" @@ -23,6 +25,6 @@ QE_UCODE="iram_Type_A_LS1021a_r1.0.bin" KERNEL_DEVICETREE ?= "ls1021a-twr.dtb" KERNEL_DEFCONFIG ?= "${S}/arch/arm/configs/ls1021a_defconfig" +UBOOT_ENTRYPOINT = "0x80008000" EXTRA_IMAGEDEPENDS += "rcw qe-ucode" - USE_VT ?= "0" -- cgit v1.2.3-54-g00ecf