[U-Boot] [PATCH 6/6] arm: socfpga: Drop the board boilerplate

Marek Vasut
2015-12-05T20:44:22Z

Drop all the common board code, since it is not completely useless.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
---
board/altera/arria5-socdk/socfpga.c | 56 -----------------------------------
board/altera/cyclone5-socdk/socfpga.c | 56 -----------------------------------
board/denx/mcvevk/socfpga.c | 56 -----------------------------------
board/ebv/socrates/socfpga.c | 56 -----------------------------------
board/sr1500/socfpga.c | 17 -----------
board/terasic/de0-nano-soc/socfpga.c | 16 ----------
board/terasic/sockit/socfpga.c | 56 -----------------------------------
7 files changed, 313 deletions(-)

diff --git a/board/altera/arria5-socdk/socfpga.c b/board/altera/arria5-socdk/socfpga.c
index 449f3b5..97fb902 100644
--- a/board/altera/arria5-socdk/socfpga.c
+++ b/board/altera/arria5-socdk/socfpga.c
@@ -3,60 +3,4 @@
*
* SPDX-License-Identifier: GPL-2.0+
*/
-
#include <common.h>
-#include <errno.h>
-#include <asm/arch/reset_manager.h>
-#include <asm/io.h>
-
-#include <usb.h>
-#include <usb/dwc2_udc.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-void s_init(void) {}
-
-/*
- * Miscellaneous platform dependent initialisations
- */
-int board_init(void)
-{
- /* Address of boot parameters for ATAG (if ATAG is used) */
- gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-
- return 0;
-}
-
-#ifdef CONFIG_USB_GADGET
-struct dwc2_plat_otg_data socfpga_otg_data = {
- .usb_gusbcfg = 0x1417,
-};
-
-int board_usb_init(int index, enum usb_init_type init)
-{
- int node[2], count;
- fdt_addr_t addr;
-
- count = fdtdec_find_aliases_for_id(gd->fdt_blob, "udc",
- COMPAT_ALTERA_SOCFPGA_DWC2USB,
- node, 2);
- if (count <= 0) /* No controller found. */
- return 0;
-
- addr = fdtdec_get_addr(gd->fdt_blob, node[0], "reg");
- if (addr == FDT_ADDR_T_NONE) {
- printf("UDC Controller has no 'reg' property!\n");
- return -EINVAL;
- }
-
- /* Patch the address from OF into the controller pdata. */
- socfpga_otg_data.regs_otg = addr;
-
- return dwc2_udc_probe(&socfpga_otg_data);
-}
-
-int g_dnl_board_usb_cable_connected(void)
-{
- return 1;
-}
-#endif
diff --git a/board/altera/cyclone5-socdk/socfpga.c b/board/altera/cyclone5-socdk/socfpga.c
index 449f3b5..97fb902 100644
--- a/board/altera/cyclone5-socdk/socfpga.c
+++ b/board/altera/cyclone5-socdk/socfpga.c
@@ -3,60 +3,4 @@
*
* SPDX-License-Identifier: GPL-2.0+
*/
-
#include <common.h>
-#include <errno.h>
-#include <asm/arch/reset_manager.h>
-#include <asm/io.h>
-
-#include <usb.h>
-#include <usb/dwc2_udc.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-void s_init(void) {}
-
-/*
- * Miscellaneous platform dependent initialisations
- */
-int board_init(void)
-{
- /* Address of boot parameters for ATAG (if ATAG is used) */
- gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-
- return 0;
-}
-
-#ifdef CONFIG_USB_GADGET
-struct dwc2_plat_otg_data socfpga_otg_data = {
- .usb_gusbcfg = 0x1417,
-};
-
-int board_usb_init(int index, enum usb_init_type init)
-{
- int node[2], count;
- fdt_addr_t addr;
-
- count = fdtdec_find_aliases_for_id(gd->fdt_blob, "udc",
- COMPAT_ALTERA_SOCFPGA_DWC2USB,
- node, 2);
- if (count <= 0) /* No controller found. */
- return 0;
-
- addr = fdtdec_get_addr(gd->fdt_blob, node[0], "reg");
- if (addr == FDT_ADDR_T_NONE) {
- printf("UDC Controller has no 'reg' property!\n");
- return -EINVAL;
- }
-
- /* Patch the address from OF into the controller pdata. */
- socfpga_otg_data.regs_otg = addr;
-
- return dwc2_udc_probe(&socfpga_otg_data);
-}
-
-int g_dnl_board_usb_cable_connected(void)
-{
- return 1;
-}
-#endif
diff --git a/board/denx/mcvevk/socfpga.c b/board/denx/mcvevk/socfpga.c
index d77d7ad..6be58f0 100644
--- a/board/denx/mcvevk/socfpga.c
+++ b/board/denx/mcvevk/socfpga.c
@@ -3,60 +3,4 @@
*
* SPDX-License-Identifier: GPL-2.0+
*/
-
#include <common.h>
-#include <errno.h>
-#include <asm/arch/reset_manager.h>
-#include <asm/io.h>
-
-#include <usb.h>
-#include <usb/dwc2_udc.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-void s_init(void) {}
-
-/*
- * Miscellaneous platform dependent initialisations
- */
-int board_init(void)
-{
- /* Address of boot parameters for ATAG (if ATAG is used) */
- gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-
- return 0;
-}
-
-#ifdef CONFIG_USB_GADGET
-struct dwc2_plat_otg_data socfpga_otg_data = {
- .usb_gusbcfg = 0x1417,
-};
-
-int board_usb_init(int index, enum usb_init_type init)
-{
- int node[2], count;
- fdt_addr_t addr;
-
- count = fdtdec_find_aliases_for_id(gd->fdt_blob, "udc",
- COMPAT_ALTERA_SOCFPGA_DWC2USB,
- node, 2);
- if (count <= 0) /* No controller found. */
- return 0;
-
- addr = fdtdec_get_addr(gd->fdt_blob, node[0], "reg");
- if (addr == FDT_ADDR_T_NONE) {
- printf("UDC Controller has no 'reg' property!\n");
- return -EINVAL;
- }
-
- /* Patch the address from OF into the controller pdata. */
- socfpga_otg_data.regs_otg = addr;
-
- return dwc2_udc_probe(&socfpga_otg_data);
-}
-
-int g_dnl_board_usb_cable_connected(void)
-{
- return 1;
-}
-#endif
diff --git a/board/ebv/socrates/socfpga.c b/board/ebv/socrates/socfpga.c
index 449f3b5..97fb902 100644
--- a/board/ebv/socrates/socfpga.c
+++ b/board/ebv/socrates/socfpga.c
@@ -3,60 +3,4 @@
*
* SPDX-License-Identifier: GPL-2.0+
*/
-
#include <common.h>
-#include <errno.h>
-#include <asm/arch/reset_manager.h>
-#include <asm/io.h>
-
-#include <usb.h>
-#include <usb/dwc2_udc.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-void s_init(void) {}
-
-/*
- * Miscellaneous platform dependent initialisations
- */
-int board_init(void)
-{
- /* Address of boot parameters for ATAG (if ATAG is used) */
- gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-
- return 0;
-}
-
-#ifdef CONFIG_USB_GADGET
-struct dwc2_plat_otg_data socfpga_otg_data = {
- .usb_gusbcfg = 0x1417,
-};
-
-int board_usb_init(int index, enum usb_init_type init)
-{
- int node[2], count;
- fdt_addr_t addr;
-
- count = fdtdec_find_aliases_for_id(gd->fdt_blob, "udc",
- COMPAT_ALTERA_SOCFPGA_DWC2USB,
- node, 2);
- if (count <= 0) /* No controller found. */
- return 0;
-
- addr = fdtdec_get_addr(gd->fdt_blob, node[0], "reg");
- if (addr == FDT_ADDR_T_NONE) {
- printf("UDC Controller has no 'reg' property!\n");
- return -EINVAL;
- }
-
- /* Patch the address from OF into the controller pdata. */
- socfpga_otg_data.regs_otg = addr;
-
- return dwc2_udc_probe(&socfpga_otg_data);
-}
-
-int g_dnl_board_usb_cable_connected(void)
-{
- return 1;
-}
-#endif
diff --git a/board/sr1500/socfpga.c b/board/sr1500/socfpga.c
index 9f89584..617dffa 100644
--- a/board/sr1500/socfpga.c
+++ b/board/sr1500/socfpga.c
@@ -5,27 +5,10 @@
*/

#include <common.h>
-#include <i2c.h>
-#include <miiphy.h>
#include <asm/arch/reset_manager.h>
#include <asm/gpio.h>
#include <asm/io.h>

-DECLARE_GLOBAL_DATA_PTR;
-
-void s_init(void) {}
-
-/*
- * Miscellaneous platform dependent initialisations
- */
-int board_init(void)
-{
- /* Address of boot parameters for ATAG (if ATAG is used) */
- gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-
- return 0;
-}
-
int board_early_init_f(void)
{
int ret;
diff --git a/board/terasic/de0-nano-soc/socfpga.c b/board/terasic/de0-nano-soc/socfpga.c
index 3ccc2a7..97fb902 100644
--- a/board/terasic/de0-nano-soc/socfpga.c
+++ b/board/terasic/de0-nano-soc/socfpga.c
@@ -3,20 +3,4 @@
*
* SPDX-License-Identifier: GPL-2.0+
*/
-
#include <common.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-void s_init(void) {}
-
-/*
- * Miscellaneous platform dependent initialisations
- */
-int board_init(void)
-{
- /* Address of boot parameters for ATAG (if ATAG is used) */
- gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-
- return 0;
-}
diff --git a/board/terasic/sockit/socfpga.c b/board/terasic/sockit/socfpga.c
index 1fe8c1c..97fb902 100644
--- a/board/terasic/sockit/socfpga.c
+++ b/board/terasic/sockit/socfpga.c
@@ -3,60 +3,4 @@
*
* SPDX-License-Identifier: GPL-2.0+
*/
-
#include <common.h>
-#include <errno.h>
-#include <asm/arch/reset_manager.h>
-#include <asm/io.h>
-
-#include <usb.h>
-#include <usb/dwc2_udc.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-void s_init(void) {}
-
-/*
- * Miscellaneous platform dependent initialisations
- */
-int board_init(void)
-{
- /* Address of boot parameters for ATAG (if ATAG is used) */
- gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-
- return 0;
-}
-
-#ifdef CONFIG_USB_GADGET
-struct dwc2_plat_otg_data socfpga_otg_data = {
- .usb_gusbcfg = 0x1417,
-};
-
-int board_usb_init(int index, enum usb_init_type init)
-{
- int node[2], count;
- fdt_addr_t addr;
-
- count = fdtdec_find_aliases_for_id(gd->fdt_blob, "udc",
- COMPAT_ALTERA_SOCFPGA_DWC2USB,
- node, 2);
- if (count <= 0) /* No controller found. */
- return -EINVAL;
-
- addr = fdtdec_get_addr(gd->fdt_blob, node[0], "reg");
- if (addr == FDT_ADDR_T_NONE) {
- printf("UDC Controller has no 'reg' property!\n");
- return -EINVAL;
- }
-
- /* Patch the address from OF into the controller pdata. */
- socfpga_otg_data.regs_otg = addr;
-
- return dwc2_udc_probe(&socfpga_otg_data);
-}
-
-int g_dnl_board_usb_cable_connected(void)
-{
- return 1;
-}
-#endif
--
2.1.4