ARM: meson: factorize common code out amlogic's boards

Now we have moved all the Amlogic board support to common generic board code,
we can move the identical board_init() and ft_board_setup() functions to
weak functions into the board-common mach-meson file.

Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>

diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c
index 6340445053b0eae19e432eda7deaf2a184c1472b..8c4f3074fbc738e3c81dc17ef322f830c4832ee5 100644 (file)
--- a/arch/arm/mach-meson/board-common.c
+++ b/arch/arm/mach-meson/board-common.c
@@ -14,6 +14,11 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+__weak int board_init(void)
+{
+       return 0;
+}
+
 int dram_init(void)
 {
        const fdt64_t *val;
@@ -34,6 +39,18 @@ int dram_init(void)
        return 0;
 }
 
+__weak int meson_ft_board_setup(void *blob, bd_t *bd)
+{
+       return 0;
+}
+
+int ft_board_setup(void *blob, bd_t *bd)
+{
+       meson_init_reserved_memory(blob);
+
+       return meson_ft_board_setup(blob, bd);
+}
+
 void meson_board_add_reserved_memory(void *fdt, u64 start, u64 size)
 {
        int ret;

diff --git a/board/amlogic/odroid-c2/odroid-c2.c b/board/amlogic/odroid-c2/odroid-c2.c
index d784d6bd092d0ed239c74570ef61fb6d51d5d62b..62f0f4c8718577c342d33499020bce7491a55a3c 100644 (file)
--- a/board/amlogic/odroid-c2/odroid-c2.c
+++ b/board/amlogic/odroid-c2/odroid-c2.c
@@ -17,11 +17,6 @@
 #define EFUSE_MAC_OFFSET       52
 #define EFUSE_MAC_SIZE         6
 
-int board_init(void)
-{
-       return 0;
-}
-
 int misc_init_r(void)
 {
        u8 mac_addr[EFUSE_MAC_SIZE];
@@ -46,10 +41,3 @@ int misc_init_r(void)
 
        return 0;
 }
-
-int ft_board_setup(void *blob, bd_t *bd)
-{
-       meson_init_reserved_memory(blob);
-
-       return 0;
-}

diff --git a/board/amlogic/p212/p212.c b/board/amlogic/p212/p212.c
index 33992a22794eaabdb3d00fafd17d5ac04719adbc..546c4d9c86d0e5bd39cf3a13fc175d598d0edb55 100644 (file)
--- a/board/amlogic/p212/p212.c
+++ b/board/amlogic/p212/p212.c
@@ -18,11 +18,6 @@
 #define EFUSE_MAC_OFFSET       52
 #define EFUSE_MAC_SIZE         6
 
-int board_init(void)
-{
-       return 0;
-}
-
 int misc_init_r(void)
 {
        u8 mac_addr[EFUSE_MAC_SIZE];
@@ -48,10 +43,3 @@ int misc_init_r(void)
 
        return 0;
 }
-
-int ft_board_setup(void *blob, bd_t *bd)
-{
-       meson_init_reserved_memory(blob);
-
-       return 0;
-}

diff --git a/board/amlogic/q200/q200.c b/board/amlogic/q200/q200.c
index b59c11bd35f4b669d055ad303727b49f26332a43..6db1b26e08121252861090082095aa4b679825f2 100644 (file)
--- a/board/amlogic/q200/q200.c
+++ b/board/amlogic/q200/q200.c
@@ -18,11 +18,6 @@
 #define EFUSE_MAC_OFFSET       52
 #define EFUSE_MAC_SIZE         6
 
-int board_init(void)
-{
-       return 0;
-}
-
 int misc_init_r(void)
 {
        u8 mac_addr[EFUSE_MAC_SIZE];
@@ -53,10 +48,3 @@ int misc_init_r(void)
 
        return 0;
 }
-
-int ft_board_setup(void *blob, bd_t *bd)
-{
-       meson_init_reserved_memory(blob);
-
-       return 0;
-}

diff --git a/board/amlogic/s400/s400.c b/board/amlogic/s400/s400.c
index c2b50f6c1799d2246057c4610f920e00ebd79618..02a0e9286cb15c889d180667c9b8f710fcf23ff7 100644 (file)
--- a/board/amlogic/s400/s400.c
+++ b/board/amlogic/s400/s400.c
@@ -13,21 +13,9 @@
 #include <asm/arch/eth.h>
 #include <asm/arch/mem.h>
 
-int board_init(void)
-{
-       return 0;
-}
-
 int misc_init_r(void)
 {
        meson_eth_init(PHY_INTERFACE_MODE_RGMII, 0);
 
        return 0;
 }
-
-int ft_board_setup(void *blob, bd_t *bd)
-{
-       meson_init_reserved_memory(blob);
-
-       return 0;
-}