common: Move hang() to the same header as panic()

[oweals/u-boot.git] / arch / arm / mach-stm32mp / config.mk

diff --git a/arch/arm/mach-stm32mp/config.mk b/arch/arm/mach-stm32mp/config.mk
index 34e59c61ac089ae9255d65fc6f4f06b9f6ced092..403af2a225e69ea025634543c324eb13a95ad75b 100644 (file)
--- a/arch/arm/mach-stm32mp/config.mk
+++ b/arch/arm/mach-stm32mp/config.mk
@@ -1,10 +1,22 @@
+# SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
 #
 # Copyright (C) 2018, STMicroelectronics - All Rights Reserved
 #
-# SPDX-License-Identifier:     GPL-2.0+        BSD-3-Clause
-#
 
-ALL-$(CONFIG_SPL_BUILD) += spl/u-boot-spl.stm32
+ifndef CONFIG_SPL
+ALL-y += u-boot.stm32
+else
+ifdef CONFIG_SPL_BUILD
+ALL-y += u-boot-spl.stm32
+endif
+endif
+
+MKIMAGEFLAGS_u-boot.stm32 = -T stm32image -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE)
+
+u-boot.stm32: MKIMAGEOUTPUT = u-boot.stm32.log
+
+u-boot.stm32: u-boot.bin FORCE
+       $(call if_changed,mkimage)
 
 MKIMAGEFLAGS_u-boot-spl.stm32 = -T stm32image -a $(CONFIG_SPL_TEXT_BASE) -e $(CONFIG_SPL_TEXT_BASE)
 
@@ -12,3 +24,6 @@ spl/u-boot-spl.stm32: MKIMAGEOUTPUT = spl/u-boot-spl.stm32.log
 
 spl/u-boot-spl.stm32: spl/u-boot-spl.bin FORCE
        $(call if_changed,mkimage)
+
+u-boot-spl.stm32 : spl/u-boot-spl.stm32
+       $(call if_changed,copy)