From ed5b09c07ad56d16a43c528bbb79ab1093bef523 Mon Sep 17 00:00:00 2001
From: Alexander Couzens <lynxis@fe80.eu>
Date: Wed, 4 Mar 2015 19:59:01 +0100
Subject: [PATCH] micro: move more config stuff into common.h

---
 u-boot/include/configs/carambola2.h | 19 +++----------------
 u-boot/include/configs/common.h     |  8 ++++++++
 u-boot/include/configs/skylab.h     | 19 +++----------------
 3 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/u-boot/include/configs/carambola2.h b/u-boot/include/configs/carambola2.h
index 7f8790e8c1..1f3f0f76ba 100644
--- a/u-boot/include/configs/carambola2.h
+++ b/u-boot/include/configs/carambola2.h
@@ -27,6 +27,9 @@
 #define CFG_FLASH_SECTOR_SIZE   (64*1024)
 #define CFG_FLASH_SIZE          0x01000000
 
+#define WLANCAL                         0x9fff1000
+#define BOARDCAL                        0x9fff0000
+
 #if (CFG_MAX_FLASH_SECT * CFG_FLASH_SECTOR_SIZE) != CFG_FLASH_SIZE
 #	error "Invalid flash configuration"
 #endif
@@ -70,22 +73,6 @@
 
 #include <configs/common.h>
 
-/*
-** Parameters defining the location of the calibration/initialization
-** information for the two Merlin devices.
-** NOTE: **This will change with different flash configurations**
-*/
-
-#define WLANCAL                         0x9fff1000
-#define BOARDCAL                        0x9fff0000
-
-#define ATHEROS_PRODUCT_ID             138
-#define CAL_SECTOR                     (CFG_MAX_FLASH_SECT - 1)
-
-/* For Kite, only PCI-e interface is valid */
-#define AR7240_ART_PCICFG_OFFSET        3
-
-
 #include <cmd_confdefs.h>
 
 #endif	/* __CONFIG_H */
diff --git a/u-boot/include/configs/common.h b/u-boot/include/configs/common.h
index 83d151b203..a630045caa 100644
--- a/u-boot/include/configs/common.h
+++ b/u-boot/include/configs/common.h
@@ -94,3 +94,11 @@
 #define CFG_BAUDRATE_TABLE { 300, 1200, 2400, 4800, 9600, 14400, 19200, 28800, 38400, 56000, 57600, \
 			115200, 128000, 230400, 250000, 256000, 460800, 500000, 576000, 921600, \
 			1000000, 1152000, 1500000, 2000000, 3000000}
+
+/* calibration */
+#define ATHEROS_PRODUCT_ID             138
+#define CAL_SECTOR                     (CFG_MAX_FLASH_SECT - 1)
+
+/* For Kite, only PCI-e interface is valid */
+#define AR7240_ART_PCICFG_OFFSET        3
+
diff --git a/u-boot/include/configs/skylab.h b/u-boot/include/configs/skylab.h
index 4feb3cc62e..239937f2fe 100644
--- a/u-boot/include/configs/skylab.h
+++ b/u-boot/include/configs/skylab.h
@@ -27,6 +27,9 @@
 #define CFG_FLASH_SECTOR_SIZE   (64*1024)
 #define CFG_FLASH_SIZE          0x00800000
 
+#define WLANCAL                         0x9fff1000
+#define BOARDCAL                        0x9fff0000
+
 #if (CFG_MAX_FLASH_SECT * CFG_FLASH_SECTOR_SIZE) != CFG_FLASH_SIZE
 #	error "Invalid flash configuration"
 #endif
@@ -68,22 +71,6 @@
 
 #include <configs/common.h>
 
-/*
-** Parameters defining the location of the calibration/initialization
-** information for the two Merlin devices.
-** NOTE: **This will change with different flash configurations**
-*/
-
-#define WLANCAL                         0x9fff1000
-#define BOARDCAL                        0x9fff0000
-
-#define ATHEROS_PRODUCT_ID             138
-#define CAL_SECTOR                     (CFG_MAX_FLASH_SECT - 1)
-
-/* For Kite, only PCI-e interface is valid */
-#define AR7240_ART_PCICFG_OFFSET        3
-
-
 #include <cmd_confdefs.h>
 
 #endif	/* __CONFIG_H */