[meta-freescale] [PATCH 17/24] u-boot-qoriq: remove redundant code

Zhenhua Luo zhenhua.luo at freescale.com
Wed Aug 12 03:22:21 PDT 2015


* remove boot-format-native from common DEPENDS, this package is needed
  by QorIQ PPC targets only, so it is defined in DEPENDS_qoriq-ppc.
* remove redundant code from do_compile and do_install, those code is
  available in u-boot.inc
* remove unnecessary ALLOW_EMPTY

Signed-off-by: Zhenhua Luo <zhenhua.luo at freescale.com>
---
 recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb b/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb
index 7342f53..f5b258d 100644
--- a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = " \
 
 PV_append = "+fslgit"
 INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS = "boot-format-native libgcc ${@base_contains('TCMODE', 'external-fsl', '', 'virtual/${TARGET_PREFIX}gcc', d)}"
+DEPENDS = "libgcc ${@base_contains('TCMODE', 'external-fsl', '', 'virtual/${TARGET_PREFIX}gcc', d)}"
 DEPENDS_append_qoriq-arm = " change-file-endianess-native dtc-native tcl-native"
 DEPENDS_append_qoriq-ppc = " boot-format-native"
 
@@ -57,26 +57,15 @@ S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = 'CROSS_COMPILE=${WRAP_TARGET_PREFIX} CC="${WRAP_TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"'
 
-do_compile_qoriq-ppc() {
-    unset LDFLAGS
-    unset CFLAGS
-    unset CPPFLAGS
-
-    if [ "x${UBOOT_MACHINES}" = "x" ]; then
-        UBOOT_MACHINES=${UBOOT_MACHINE}
-    fi
-
+do_compile_append_qoriq-ppc() {
     python ./tools/genboardscfg.py
-    for board in ${UBOOT_MACHINES}; do
+
+    for board in ${UBOOT_MACHINE}; do
         if ! grep -wq $board ${S}/boards.cfg;then
             echo "WARNING: $board not supported in boards.cfg"
             continue
         fi
 
-        oe_runmake O=${board} distclean
-        oe_runmake O=${board} ${board}_config
-        oe_runmake O=${board} all
-
         case "${board}" in
             *SDCARD*)   UBOOT_TARGET="u-boot-sd";;
             *SPIFLASH*) UBOOT_TARGET="u-boot-spi";;
@@ -142,11 +131,7 @@ do_compile_append_qoriq-arm () {
 }
 
 do_install_append_qoriq-ppc() {
-    if [ "x${UBOOT_MACHINES}" = "x" ]; then
-        UBOOT_MACHINES=${UBOOT_MACHINE}
-    fi
-
-    for board in ${UBOOT_MACHINES}; do
+    for board in ${UBOOT_MACHINE}; do
         if ! grep -wq $board ${S}/boards.cfg;then
             continue
         fi
@@ -201,5 +186,3 @@ PACKAGES += "${PN}-images"
 FILES_${PN}-images += "/boot"
 
 COMPATIBLE_MACHINE = "(qoriq)"
-
-ALLOW_EMPTY_${PN} = "1"
-- 
2.4.3



More information about the meta-freescale mailing list