From e17ba2e4bcdb486d5776b59713fb93ea65530e45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20St=C3=A4bler?= <oliver.staebler@bytesatwork.ch>
Date: Tue, 30 Jul 2019 15:32:27 +0200
Subject: [PATCH] MACHINE: Move LOADADDR into include

Move the setting of the default LOADADDR into an include instead of
setting this in each machine.
---
 conf/machine/include/st-machine-common-stm32mp.inc | 6 ++++++
 conf/machine/stm32mp1-disco.conf                   | 6 ------
 conf/machine/stm32mp1-eval.conf                    | 6 ------
 conf/machine/stm32mp1.conf                         | 6 ------
 4 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/conf/machine/include/st-machine-common-stm32mp.inc b/conf/machine/include/st-machine-common-stm32mp.inc
index c7dfd4e..2cbab00 100644
--- a/conf/machine/include/st-machine-common-stm32mp.inc
+++ b/conf/machine/include/st-machine-common-stm32mp.inc
@@ -209,6 +209,12 @@ STM32MP_KERNEL_DEVICETREE += "${@' '.join('%s.dtb' % d for d in '${STM32MP_DEVIC
 STM32MP_KERNEL_DEVICETREE += "${@' '.join('%s.dtb' % d for d in '${CUBE_M4_EXAMPLES_DT}'.split())}"
 STM32MP_KERNEL_DEVICETREE += "${@' '.join('%s.dtb' % d for d in '${LINUX_A7_EXAMPLES_DT}'.split())}"
 
+# Set LOADADDR
+# Set this address to 0xC2000040, which is 0xC2000000 + 0x40.
+# 0xC2000000 is the memory address where U-Boot will copy from flash the file uImage and 0x40 is uImage header size (64Bytes).
+# With this value, U-Boot will be able to execute in place the zImage contained in uImage.
+ST_KERNEL_LOADADDR ?= "0xC2000040"
+
 # Define the devicetree for Linux A7 examples
 LINUX_A7_EXAMPLES_DT ?= ""
 
diff --git a/conf/machine/stm32mp1-disco.conf b/conf/machine/stm32mp1-disco.conf
index 74f8b75..ec5c546 100644
--- a/conf/machine/stm32mp1-disco.conf
+++ b/conf/machine/stm32mp1-disco.conf
@@ -45,12 +45,6 @@ MACHINE_FEATURES += "splashscreen"
 # =========================================================================
 # Kernel
 # =========================================================================
-# Kernel config
-# Set this address to 0xC2000040, which is 0xC2000000 + 0x40.
-# 0xC2000000 is the memory address where U-Boot will copy from flash the file uImage and 0x40 is uImage header size (64Bytes).
-# With this value, U-Boot will be able to execute in place the zImage contained in uImage.
-ST_KERNEL_LOADADDR   = "0xC2000040"
-
 # For eval board: auto-load goodix module (touchscreen module)
 #KERNEL_MODULE_AUTOLOAD = "goodix"
 
diff --git a/conf/machine/stm32mp1-eval.conf b/conf/machine/stm32mp1-eval.conf
index efbddcf..2cd8e93 100644
--- a/conf/machine/stm32mp1-eval.conf
+++ b/conf/machine/stm32mp1-eval.conf
@@ -45,12 +45,6 @@ MACHINE_FEATURES += "splashscreen"
 # =========================================================================
 # Kernel
 # =========================================================================
-# Kernel config
-# Set this address to 0xC2000040, which is 0xC2000000 + 0x40.
-# 0xC2000000 is the memory address where U-Boot will copy from flash the file uImage and 0x40 is uImage header size (64Bytes).
-# With this value, U-Boot will be able to execute in place the zImage contained in uImage.
-ST_KERNEL_LOADADDR   = "0xC2000040"
-
 # For eval board: auto-load goodix module (touchscreen module)
 KERNEL_MODULE_AUTOLOAD = "goodix"
 
diff --git a/conf/machine/stm32mp1.conf b/conf/machine/stm32mp1.conf
index f8e50ff..c3c2584 100644
--- a/conf/machine/stm32mp1.conf
+++ b/conf/machine/stm32mp1.conf
@@ -45,12 +45,6 @@ IMAGE_FSTYPES += "stmultiubi"
 # =========================================================================
 # Kernel
 # =========================================================================
-# Kernel config
-# Set this address to 0xC2000040, which is 0xC2000000 + 0x40.
-# 0xC2000000 is the memory address where U-Boot will copy from flash the file uImage and 0x40 is uImage header size (64Bytes).
-# With this value, U-Boot will be able to execute in place the zImage contained in uImage.
-ST_KERNEL_LOADADDR   = "0xC2000040"
-
 # For eval board: auto-load goodix module (touchscreen module)
 KERNEL_MODULE_AUTOLOAD = "goodix"