From 16a50412b0adcbd51fce55006fe15155181be06b Mon Sep 17 00:00:00 2001 From: Zhenhua Luo Date: Wed, 12 Aug 2015 22:42:42 +0800 Subject: [PATCH] Update ls1021atwr machine conf * update the DESCRIPTION to provide more details * add sdcard, lpuart and qspi in UBOOT_CONFIG * add KERNEL_DEFCONFIG * remove duplicated variables which are in qoriq-arm.inc Signed-off-by: Zhenhua Luo Signed-off-by: Otavio Salvador --- conf/machine/ls1021atwr.conf | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/conf/machine/ls1021atwr.conf b/conf/machine/ls1021atwr.conf index 4478e953..a01429c8 100644 --- a/conf/machine/ls1021atwr.conf +++ b/conf/machine/ls1021atwr.conf @@ -1,7 +1,8 @@ #@TYPE: Machine #@NAME: Freescale LS1021ATWR board #@SOC: ls102xa -#@DESCRIPTION: Machine configuration for running LS1021ATWR in 32-bit mode +#@DESCRIPTION: Machine configuration for Freescale QorIQ LS1 Tower System +# Module with ARM Cortex-A7 core #@MAINTAINER: Zhenhua Luo require conf/machine/include/qoriq-arm.inc @@ -9,7 +10,7 @@ require conf/machine/include/tune-cortexa7.inc SOC_FAMILY = "ls102xa" -UBOOT_CONFIG ??= "nor" +UBOOT_CONFIG ??= "nor sdcard lpuart qspi" UBOOT_CONFIG[nor] = "ls1021atwr_nor_config" UBOOT_CONFIG[sdcard] = "ls1021atwr_sdcard_config,sdcard" UBOOT_CONFIG[lpuart] = "ls1021atwr_nor_lpuart_config" @@ -19,8 +20,6 @@ UBOOT_CONFIG[secure-boot] = "ls1021atwr_nor_SECURE_BOOT_config" QE_UCODE="iram_Type_A_LS1021a_r1.0.bin" KERNEL_DEVICETREE ?= "ls1021a-twr.dtb" +KERNEL_DEFCONFIG ?= "${S}/arch/arm/configs/ls1021a_defconfig" -SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0" -SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" -USE_VT ?= "0" - +EXTRA_IMAGEDEPENDS += "rcw qe-ucode" -- 2.40.1