API: unify platform_sys_info() implementations

ARM, MIPS, and RISCV can use the same implementation of
platform_sys_info(). PPC provides some extra information.
So keep it separate.

Signed-off-by: Heinrich Schuchardt <[email protected]>

diff --git a/api/Makefile b/api/Makefile
index bd2d035fcdbdd09d6f9cb58ce312b8ac49d18f8f..ce3de6b6a1c569adb0ad4e8a0c91ea3e29fb62ad 100644 (file)
--- a/api/Makefile
+++ b/api/Makefile
@@ -1,8 +1,11 @@
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
 # (C) Copyright 2007 Semihalf
 
 obj-y += api.o api_display.o api_net.o api_storage.o
-obj-$(CONFIG_ARM) += api_platform-arm.o
+
+ifeq (CONFIG_PPC,y)
 obj-$(CONFIG_PPC) += api_platform-powerpc.o
-obj-$(CONFIG_MIPS) += api_platform-mips.o
+else
+obj-y += api_platform.o
+endif

diff --git a/api/api_platform-arm.c b/api/api_platform-arm.c
deleted file mode 100644 (file)
index 9afba66..0000000
--- a/api/api_platform-arm.c
+++ /dev/null
@@ -1,35 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2007 Semihalf
- *
- * Written by: Rafal Jaworowski <[email protected]>
- *
- * This file contains routines that fetch data from ARM-dependent sources
- * (bd_info etc.)
- */
-
-#include <config.h>
-#include <linux/types.h>
-#include <api_public.h>
-
-#include <asm/global_data.h>
-
-#include "api_private.h"
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/*
- * Important notice: handling of individual fields MUST be kept in sync with
- * include/asm-arm/u-boot.h and include/asm-arm/global_data.h, so any changes
- * need to reflect their current state and layout of structures involved!
- */
-int platform_sys_info(struct sys_info *si)
-{
-       int i;
-
-       for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++)
-               platform_set_mr(si, gd->bd->bi_dram[i].start,
-                               gd->bd->bi_dram[i].size, MR_ATTR_DRAM);
-
-       return 1;
-}

diff --git a/api/api_platform-mips.c b/api/api_platform-mips.c
deleted file mode 100644 (file)
index 262b35a..0000000
--- a/api/api_platform-mips.c
+++ /dev/null
@@ -1,29 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2007 Stanislav Galabov <[email protected]>
- *
- * This file contains routines that fetch data from bd_info sources
- */
-
-#include <config.h>
-#include <linux/types.h>
-#include <api_public.h>
-
-#include <asm/global_data.h>
-
-#include "api_private.h"
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/*
- * Important notice: handling of individual fields MUST be kept in sync with
- * include/asm-generic/u-boot.h, so any changes
- * need to reflect their current state and layout of structures involved!
- */
-int platform_sys_info(struct sys_info *si)
-{
-
-       platform_set_mr(si, gd->ram_base, gd->ram_size, MR_ATTR_DRAM);
-
-       return 1;
-}

diff --git a/api/api_platform.c b/api/api_platform.c
new file mode 100644 (file)
index 0000000..7a789bd
--- /dev/null
+++ b/api/api_platform.c
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * (C) Copyright 2007 Semihalf
+ *
+ * Written by: Rafal Jaworowski <[email protected]>
+ *
+ * This file contains a routine to fetch data from the global_data structure.
+ */
+
+#include <api_public.h>
+#include <asm/global_data.h>
+#include "api_private.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+int platform_sys_info(struct sys_info *si)
+{
+       int i;
+
+       for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++)
+               platform_set_mr(si, gd->bd->bi_dram[i].start,
+                               gd->bd->bi_dram[i].size, MR_ATTR_DRAM);
+
+       return 1;
+}