From d89a97ef9403f79b98853e2a9ddfa36733c1a6e8 Mon Sep 17 00:00:00 2001 From: Enrico Leto Date: Wed, 24 Jan 2024 15:43:53 +0100 Subject: siemens: board: clean up products folders vs common The common folder was initialially created for the common parts of the products based on draco-am355x board family. These are the product lines 'pxm2', 'rut' and the base line named 'draco'! Adding the new capricorn-imx8 board family, common was enhanced without cleanup. - rename 'common/board.c' to 'common/board_am335x.c' - add 'common/board_am335x.h' for export to the product lines Reviewed-by: Alexander Sverdlin Signed-off-by: Enrico Leto --- board/siemens/common/board.c | 267 ----------------------------------- board/siemens/common/board_am335x.c | 268 ++++++++++++++++++++++++++++++++++++ board/siemens/common/board_am335x.h | 39 ++++++ board/siemens/draco/Makefile | 1 + board/siemens/draco/board.c | 8 +- board/siemens/draco/board.h | 31 +---- board/siemens/pxm2/MAINTAINERS | 2 +- board/siemens/pxm2/Makefile | 1 + board/siemens/pxm2/board.c | 10 +- board/siemens/pxm2/board.h | 21 --- board/siemens/rut/MAINTAINERS | 2 +- board/siemens/rut/Makefile | 1 + board/siemens/rut/board.c | 10 +- board/siemens/rut/board.h | 21 --- 14 files changed, 328 insertions(+), 354 deletions(-) delete mode 100644 board/siemens/common/board.c create mode 100644 board/siemens/common/board_am335x.c create mode 100644 board/siemens/common/board_am335x.h delete mode 100644 board/siemens/pxm2/board.h delete mode 100644 board/siemens/rut/board.h diff --git a/board/siemens/common/board.c b/board/siemens/common/board.c deleted file mode 100644 index e5a42d7..0000000 --- a/board/siemens/common/board.c +++ /dev/null @@ -1,267 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Common board functions for siemens AM335X based boards - * (C) Copyright 2013 Siemens Schweiz AG - * (C) Heiko Schocher, DENX Software Engineering, hs@denx.de. - * - * Based on: - * U-Boot file:/board/ti/am335x/board.c - * Copyright (C) 2011, Texas Instruments, Incorporated - https://www.ti.com/ - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "eeprom.h" -#include "factoryset.h" - -DECLARE_GLOBAL_DATA_PTR; - - -#ifdef CONFIG_SPL_BUILD -void set_uart_mux_conf(void) -{ - enable_uart0_pin_mux(); -} - -void set_mux_conf_regs(void) -{ - /* Initalize the board header */ - enable_i2c0_pin_mux(); - - /* enable early the console */ - gd->baudrate = CONFIG_BAUDRATE; - serial_init(); - gd->have_console = 1; - - siemens_ee_setup(); - if (read_eeprom() < 0) - puts("Could not get board ID.\n"); - - enable_board_pin_mux(); -} - -void sdram_init(void) -{ - spl_siemens_board_init(); - board_init_ddr(); - - return; -} -#endif /* #ifdef CONFIG_SPL_BUILD */ - -#ifndef CONFIG_SPL_BUILD -/* - * Basic board specific setup. Pinmux has been handled already. - */ -int board_init(void) -{ -#if defined(CONFIG_HW_WATCHDOG) - hw_watchdog_init(); -#endif /* defined(CONFIG_HW_WATCHDOG) */ - if (siemens_ee_setup() < 0) - puts("Could not get board ID.\n"); -#ifdef CONFIG_MACH_TYPE - gd->bd->bi_arch_number = CONFIG_MACH_TYPE; -#endif - gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100; - -#ifdef CONFIG_FACTORYSET - factoryset_read_eeprom(SIEMENS_EE_I2C_ADDR); -#endif - - gpmc_init(); - - return 0; -} -#endif /* #ifndef CONFIG_SPL_BUILD */ - -#define OSC (V_OSCK/1000000) -const struct dpll_params dpll_ddr = { - DDR_PLL_FREQ, OSC-1, 1, -1, -1, -1, -1}; - -const struct dpll_params *get_dpll_ddr_params(void) -{ - return &dpll_ddr; -} - -#ifndef CONFIG_SPL_BUILD - -#define MAX_NR_LEDS 10 -#define MAX_PIN_NUMBER 128 -#define STARTUP 0 - -#if defined(BOARD_DFU_BUTTON_GPIO) -unsigned char get_button_state(char * const envname, unsigned char def) -{ - int button = 0; - int gpio; - char *ptr_env; - - /* If button is not found we take default */ - ptr_env = env_get(envname); - if (NULL == ptr_env) { - gpio = def; - } else { - gpio = (unsigned char)simple_strtoul(ptr_env, NULL, 0); - if (gpio > MAX_PIN_NUMBER) - gpio = def; - } - - gpio_request(gpio, ""); - gpio_direction_input(gpio); - if (gpio_get_value(gpio)) - button = 1; - else - button = 0; - - gpio_free(gpio); - - return button; -} -/** - * This command returns the status of the user button on - * Input - none - * Returns - 1 if button is held down - * 0 if button is not held down - */ -static int -do_userbutton(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) -{ - int button = 0; - button = get_button_state("button_dfu0", BOARD_DFU_BUTTON_GPIO); - button |= get_button_state("button_dfu1", BOARD_DFU_BUTTON_GPIO); - return button; -} - -U_BOOT_CMD( - dfubutton, CONFIG_SYS_MAXARGS, 1, do_userbutton, - "Return the status of the DFU button", - "" -); -#endif - -static int -do_usertestwdt(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) -{ - printf("\n\n\n Go into infinite loop\n\n\n"); - while (1) - ; - return 0; -}; - -U_BOOT_CMD( - testwdt, CONFIG_SYS_MAXARGS, 1, do_usertestwdt, - "Sends U-Boot into infinite loop", - "" -); - -/** - * Get led gpios from env and set them. - * The led define in environment need to need to be of the form ledN=NN,S0,S1 - * where N is an unsigned integer from 0 to 9 and S0 and S1 is 0 or 1. S0 - * defines the startup state of the led, S1 the special state of the led when - * it enters e.g. dfu mode. - */ -void set_env_gpios(unsigned char state) -{ - char *ptr_env; - char str_tmp[5]; /* must contain "ledX"*/ - unsigned char i, idx, pos1, pos2, ccount; - unsigned char gpio_n, gpio_s0, gpio_s1; - - for (i = 0; i < MAX_NR_LEDS; i++) { - sprintf(str_tmp, "led%d", i); - - /* If env var is not found we stop */ - ptr_env = env_get(str_tmp); - if (NULL == ptr_env) - break; - - /* Find sperators position */ - pos1 = 0; - pos2 = 0; - ccount = 0; - for (idx = 0; ptr_env[idx] != '\0'; idx++) { - if (ptr_env[idx] == ',') { - if (ccount++ < 1) - pos1 = idx; - else - pos2 = idx; - } - } - /* Bad led description skip this definition */ - if (pos2 <= pos1 || ccount > 2) - continue; - - /* Get pin number and request gpio */ - memset(str_tmp, 0, sizeof(str_tmp)); - strncpy(str_tmp, ptr_env, pos1*sizeof(char)); - gpio_n = (unsigned char)simple_strtoul(str_tmp, NULL, 0); - - /* Invalid gpio number skip definition */ - if (gpio_n > MAX_PIN_NUMBER) - continue; - - gpio_request(gpio_n, ""); - - if (state == STARTUP) { - /* get pin state 0 and set */ - memset(str_tmp, 0, sizeof(str_tmp)); - strncpy(str_tmp, ptr_env+pos1+1, - (pos2-pos1-1)*sizeof(char)); - gpio_s0 = (unsigned char)simple_strtoul(str_tmp, NULL, - 0); - - gpio_direction_output(gpio_n, gpio_s0); - - } else { - /* get pin state 1 and set */ - memset(str_tmp, 0, sizeof(str_tmp)); - strcpy(str_tmp, ptr_env+pos2+1); - gpio_s1 = (unsigned char)simple_strtoul(str_tmp, NULL, - 0); - gpio_direction_output(gpio_n, gpio_s1); - } - } /* loop through defined led in environment */ -} - -static int do_board_led(struct cmd_tbl *cmdtp, int flag, int argc, - char *const argv[]) -{ - if (argc != 2) - return CMD_RET_USAGE; - if ((unsigned char)simple_strtoul(argv[1], NULL, 0) == STARTUP) - set_env_gpios(0); - else - set_env_gpios(1); - return 0; -}; - -U_BOOT_CMD( - draco_led, CONFIG_SYS_MAXARGS, 2, do_board_led, - "Set LEDs defined in environment", - "<0|1>" -); -#endif /* !CONFIG_SPL_BUILD */ diff --git a/board/siemens/common/board_am335x.c b/board/siemens/common/board_am335x.c new file mode 100644 index 0000000..c55ca98 --- /dev/null +++ b/board/siemens/common/board_am335x.c @@ -0,0 +1,268 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Common board functions for siemens AM335X based boards + * (C) Copyright 2013 Siemens Schweiz AG + * (C) Heiko Schocher, DENX Software Engineering, hs@denx.de. + * + * Based on: + * U-Boot file:/board/ti/am335x/board.c + * Copyright (C) 2011, Texas Instruments, Incorporated - https://www.ti.com/ + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "board_am335x.h" +#include "eeprom.h" +#include "factoryset.h" + +DECLARE_GLOBAL_DATA_PTR; + + +#ifdef CONFIG_SPL_BUILD +void set_uart_mux_conf(void) +{ + enable_uart0_pin_mux(); +} + +void set_mux_conf_regs(void) +{ + /* Initalize the board header */ + enable_i2c0_pin_mux(); + + /* enable early the console */ + gd->baudrate = CONFIG_BAUDRATE; + serial_init(); + gd->have_console = 1; + + siemens_ee_setup(); + if (draco_read_eeprom() < 0) + puts("Could not get board ID.\n"); + + enable_board_pin_mux(); +} + +void sdram_init(void) +{ + spl_draco_board_init(); + draco_init_ddr(); + + return; +} +#endif /* #ifdef CONFIG_SPL_BUILD */ + +#ifndef CONFIG_SPL_BUILD +/* + * Basic board specific setup. Pinmux has been handled already. + */ +int board_init(void) +{ +#if defined(CONFIG_HW_WATCHDOG) + hw_watchdog_init(); +#endif /* defined(CONFIG_HW_WATCHDOG) */ + if (siemens_ee_setup() < 0) + puts("Could not get board ID.\n"); +#ifdef CONFIG_MACH_TYPE + gd->bd->bi_arch_number = CONFIG_MACH_TYPE; +#endif + gd->bd->bi_boot_params = CFG_SYS_SDRAM_BASE + 0x100; + +#ifdef CONFIG_FACTORYSET + factoryset_read_eeprom(SIEMENS_EE_I2C_ADDR); +#endif + + gpmc_init(); + + return 0; +} +#endif /* #ifndef CONFIG_SPL_BUILD */ + +#define OSC (V_OSCK/1000000) +const struct dpll_params dpll_ddr = { + DDR_PLL_FREQ, OSC-1, 1, -1, -1, -1, -1}; + +const struct dpll_params *get_dpll_ddr_params(void) +{ + return &dpll_ddr; +} + +#ifndef CONFIG_SPL_BUILD + +#define MAX_NR_LEDS 10 +#define MAX_PIN_NUMBER 128 +#define STARTUP 0 + +#if defined(BOARD_DFU_BUTTON_GPIO) +unsigned char get_button_state(char * const envname, unsigned char def) +{ + int button = 0; + int gpio; + char *ptr_env; + + /* If button is not found we take default */ + ptr_env = env_get(envname); + if (NULL == ptr_env) { + gpio = def; + } else { + gpio = (unsigned char)simple_strtoul(ptr_env, NULL, 0); + if (gpio > MAX_PIN_NUMBER) + gpio = def; + } + + gpio_request(gpio, ""); + gpio_direction_input(gpio); + if (gpio_get_value(gpio)) + button = 1; + else + button = 0; + + gpio_free(gpio); + + return button; +} +/** + * This command returns the status of the user button on + * Input - none + * Returns - 1 if button is held down + * 0 if button is not held down + */ +static int +do_userbutton(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) +{ + int button = 0; + button = get_button_state("button_dfu0", BOARD_DFU_BUTTON_GPIO); + button |= get_button_state("button_dfu1", BOARD_DFU_BUTTON_GPIO); + return button; +} + +U_BOOT_CMD( + dfubutton, CONFIG_SYS_MAXARGS, 1, do_userbutton, + "Return the status of the DFU button", + "" +); +#endif + +static int +do_usertestwdt(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) +{ + printf("\n\n\n Go into infinite loop\n\n\n"); + while (1) + ; + return 0; +}; + +U_BOOT_CMD( + testwdt, CONFIG_SYS_MAXARGS, 1, do_usertestwdt, + "Sends U-Boot into infinite loop", + "" +); + +/** + * Get led gpios from env and set them. + * The led define in environment need to need to be of the form ledN=NN,S0,S1 + * where N is an unsigned integer from 0 to 9 and S0 and S1 is 0 or 1. S0 + * defines the startup state of the led, S1 the special state of the led when + * it enters e.g. dfu mode. + */ +void set_env_gpios(unsigned char state) +{ + char *ptr_env; + char str_tmp[5]; /* must contain "ledX"*/ + unsigned char i, idx, pos1, pos2, ccount; + unsigned char gpio_n, gpio_s0, gpio_s1; + + for (i = 0; i < MAX_NR_LEDS; i++) { + sprintf(str_tmp, "led%d", i); + + /* If env var is not found we stop */ + ptr_env = env_get(str_tmp); + if (NULL == ptr_env) + break; + + /* Find sperators position */ + pos1 = 0; + pos2 = 0; + ccount = 0; + for (idx = 0; ptr_env[idx] != '\0'; idx++) { + if (ptr_env[idx] == ',') { + if (ccount++ < 1) + pos1 = idx; + else + pos2 = idx; + } + } + /* Bad led description skip this definition */ + if (pos2 <= pos1 || ccount > 2) + continue; + + /* Get pin number and request gpio */ + memset(str_tmp, 0, sizeof(str_tmp)); + strncpy(str_tmp, ptr_env, pos1*sizeof(char)); + gpio_n = (unsigned char)simple_strtoul(str_tmp, NULL, 0); + + /* Invalid gpio number skip definition */ + if (gpio_n > MAX_PIN_NUMBER) + continue; + + gpio_request(gpio_n, ""); + + if (state == STARTUP) { + /* get pin state 0 and set */ + memset(str_tmp, 0, sizeof(str_tmp)); + strncpy(str_tmp, ptr_env+pos1+1, + (pos2-pos1-1)*sizeof(char)); + gpio_s0 = (unsigned char)simple_strtoul(str_tmp, NULL, + 0); + + gpio_direction_output(gpio_n, gpio_s0); + + } else { + /* get pin state 1 and set */ + memset(str_tmp, 0, sizeof(str_tmp)); + strcpy(str_tmp, ptr_env+pos2+1); + gpio_s1 = (unsigned char)simple_strtoul(str_tmp, NULL, + 0); + gpio_direction_output(gpio_n, gpio_s1); + } + } /* loop through defined led in environment */ +} + +static int do_board_led(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) +{ + if (argc != 2) + return CMD_RET_USAGE; + if ((unsigned char)simple_strtoul(argv[1], NULL, 0) == STARTUP) + set_env_gpios(0); + else + set_env_gpios(1); + return 0; +}; + +U_BOOT_CMD( + draco_led, CONFIG_SYS_MAXARGS, 2, do_board_led, + "Set LEDs defined in environment", + "<0|1>" +); +#endif /* !CONFIG_SPL_BUILD */ diff --git a/board/siemens/common/board_am335x.h b/board/siemens/common/board_am335x.h new file mode 100644 index 0000000..3a20352 --- /dev/null +++ b/board/siemens/common/board_am335x.h @@ -0,0 +1,39 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Board definitions for draco products + * + * (C) Copyright 2013 Siemens Schweiz AG + * (C) Heiko Schocher, DENX Software Engineering, hs@denx.de. + * + * Based on: + * TI AM335x boards information header + * u-boot:/board/ti/am335x/board.h + * + * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/ + */ + +#ifndef _BOARD_AM335X_H_ +#define _BOARD_AM335X_H_ + +#include "eeprom.h" + +/* Common functions with product specific implementation */ +void spl_draco_board_init(void); +void draco_init_ddr(void); +int draco_read_eeprom(void); + +#ifdef CONFIG_SPL_BUILD +/* Mux for init: uart?, i2c0 to read the main EEPROM */ +void enable_uart0_pin_mux(void); +void enable_uart1_pin_mux(void); +void enable_uart2_pin_mux(void); +void enable_uart3_pin_mux(void); +void enable_uart4_pin_mux(void); +void enable_uart5_pin_mux(void); +void enable_i2c0_pin_mux(void); + +/* Main mux function to enable other pinmux required on the board */ +void enable_board_pin_mux(void); +#endif /* CONFIG_SPL_BUILD */ + +#endif /* _BOARD_AM335X_H_ */ diff --git a/board/siemens/draco/Makefile b/board/siemens/draco/Makefile index 1d0cb82..aae5364 100644 --- a/board/siemens/draco/Makefile +++ b/board/siemens/draco/Makefile @@ -14,6 +14,7 @@ obj-y := mux.o endif obj-y += board.o +obj-y += ../common/board_am335x.o obj-y += ../common/eeprom.o ifndef CONFIG_SPL_BUILD obj-y += ../common/factoryset.o diff --git a/board/siemens/draco/board.c b/board/siemens/draco/board.c index d108d3e..2412a04 100644 --- a/board/siemens/draco/board.c +++ b/board/siemens/draco/board.c @@ -159,7 +159,7 @@ static int draco_read_nand_geometry(void) /* * Read header information from EEPROM into global structure. */ -static int read_eeprom(void) +int draco_read_eeprom(void) { /* Read Siemens eeprom data (DDR3) */ if (siemens_ee_read_data(SIEMENS_EE_ADDR_DDR3, (uchar *)&settings.ddr3, @@ -195,7 +195,7 @@ static int read_eeprom(void) return draco_read_nand_geometry(); } -static void board_init_ddr(void) +void draco_init_ddr(void) { struct emif_regs draco_ddr3_emif_reg_data = { .zq_config = 0x50074BE4, @@ -242,7 +242,7 @@ struct ctrl_ioregs draco_ddr3_ioregs = { &draco_ddr3_cmd_ctrl_data, &draco_ddr3_emif_reg_data, 0); } -static void spl_siemens_board_init(void) +void spl_draco_board_init(void) { return; } @@ -357,5 +357,3 @@ U_BOOT_CMD( ); #endif /* #if defined(CONFIG_DRIVER_TI_CPSW) */ #endif /* #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) */ - -#include "../common/board.c" diff --git a/board/siemens/draco/board.h b/board/siemens/draco/board.h index f027427..935f340 100644 --- a/board/siemens/draco/board.h +++ b/board/siemens/draco/board.h @@ -1,19 +1,15 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * board.h + * Board definitions for draco products * * (C) Copyright 2013 Siemens Schweiz AG * (C) Heiko Schocher, DENX Software Engineering, hs@denx.de. * - * Based on: - * TI AM335x boards information header - * u-boot:/board/ti/am335x/board.h - * - * Copyright (C) 2011, Texas Instruments, Incorporated - https://www.ti.com/ + * TI am335x specifics moved to ../common/board_am335x.h */ -#ifndef _BOARD_H_ -#define _BOARD_H_ +#ifndef _BOARD_DRACO_H_ +#define _BOARD_DRACO_H_ #define PARGS(x) #x , /* Parameter Name */ \ settings.ddr3.x, /* EEPROM Value */ \ @@ -58,21 +54,4 @@ struct draco_baseboard_id { struct chip_data chip; }; -/* - * We have three pin mux functions that must exist. We must be able to enable - * uart0, for initial output and i2c0 to read the main EEPROM. We then have a - * main pinmux function that can be overridden to enable all other pinmux that - * is required on the board. - */ -void enable_uart0_pin_mux(void); -void enable_uart1_pin_mux(void); -void enable_uart2_pin_mux(void); -void enable_uart3_pin_mux(void); -void enable_uart4_pin_mux(void); -void enable_uart5_pin_mux(void); -void enable_i2c0_pin_mux(void); -void enable_board_pin_mux(void); - -/* Forwared declaration, defined in common board.c */ -void set_env_gpios(unsigned char state); -#endif +#endif /* _BOARD_DRACO_H_ */ diff --git a/board/siemens/pxm2/MAINTAINERS b/board/siemens/pxm2/MAINTAINERS index dc02fe8..4902544 100644 --- a/board/siemens/pxm2/MAINTAINERS +++ b/board/siemens/pxm2/MAINTAINERS @@ -1,5 +1,5 @@ PXM2 BOARD -M: Samuel Egli +M: Enrico Leto S: Maintained F: board/siemens/pxm2/ F: include/configs/pxm2.h diff --git a/board/siemens/pxm2/Makefile b/board/siemens/pxm2/Makefile index 1d0cb82..aae5364 100644 --- a/board/siemens/pxm2/Makefile +++ b/board/siemens/pxm2/Makefile @@ -14,6 +14,7 @@ obj-y := mux.o endif obj-y += board.o +obj-y += ../common/board_am335x.o obj-y += ../common/eeprom.o ifndef CONFIG_SPL_BUILD obj-y += ../common/factoryset.o diff --git a/board/siemens/pxm2/board.c b/board/siemens/pxm2/board.c index 16b0d3d..bff6d20 100644 --- a/board/siemens/pxm2/board.c +++ b/board/siemens/pxm2/board.c @@ -35,7 +35,7 @@ #include #include #include -#include "board.h" +#include "../common/board_am335x.h" #include "../common/eeprom.h" #include "../common/factoryset.h" #include "pmic.h" @@ -43,7 +43,7 @@ #include #ifdef CONFIG_SPL_BUILD -static void board_init_ddr(void) +void draco_init_ddr(void) { struct emif_regs pxm2_ddr3_emif_reg_data = { .sdram_config = 0x41805332, @@ -135,7 +135,7 @@ int voltage_update(unsigned int module, unsigned char vddx_op_vol_sel) const struct dpll_params dpll_mpu_pxm2 = { 720, OSC-1, 1, -1, -1, -1, -1}; -void spl_siemens_board_init(void) +void spl_draco_board_init(void) { uchar buf[4]; /* @@ -162,7 +162,7 @@ void spl_siemens_board_init(void) } } -int read_eeprom(void) +int draco_read_eeprom(void) { /* nothing ToDo here for this board */ @@ -275,5 +275,3 @@ int board_late_init(void) return 0; } #endif - -#include "../common/board.c" diff --git a/board/siemens/pxm2/board.h b/board/siemens/pxm2/board.h deleted file mode 100644 index 9067e4d..0000000 --- a/board/siemens/pxm2/board.h +++ /dev/null @@ -1,21 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * board.h - * - * (C) Copyright 2013 Siemens Schweiz AG - * (C) Heiko Schocher, DENX Software Engineering, hs@denx.de. - * - * Based on: - * TI AM335x boards information header - * u-boot:/board/ti/am335x/board.h - * - * Copyright (C) 2011, Texas Instruments, Incorporated - https://www.ti.com/ - */ - -#ifndef _BOARD_H_ -#define _BOARD_H_ - -void enable_uart0_pin_mux(void); -void enable_i2c0_pin_mux(void); -void enable_board_pin_mux(void); -#endif diff --git a/board/siemens/rut/MAINTAINERS b/board/siemens/rut/MAINTAINERS index 1e92710..4d8e256 100644 --- a/board/siemens/rut/MAINTAINERS +++ b/board/siemens/rut/MAINTAINERS @@ -1,5 +1,5 @@ RUT BOARD -M: Samuel Egli +M: Enrico Leto S: Maintained F: board/siemens/rut/ F: include/configs/rut.h diff --git a/board/siemens/rut/Makefile b/board/siemens/rut/Makefile index 1d0cb82..aae5364 100644 --- a/board/siemens/rut/Makefile +++ b/board/siemens/rut/Makefile @@ -14,6 +14,7 @@ obj-y := mux.o endif obj-y += board.o +obj-y += ../common/board_am335x.o obj-y += ../common/eeprom.o ifndef CONFIG_SPL_BUILD obj-y += ../common/factoryset.o diff --git a/board/siemens/rut/board.c b/board/siemens/rut/board.c index d9e84db..1e0e131 100644 --- a/board/siemens/rut/board.c +++ b/board/siemens/rut/board.c @@ -35,7 +35,7 @@ #include #include #include -#include "board.h" +#include "../common/board_am335x.h" #include "../common/eeprom.h" #include "../common/factoryset.h" @@ -43,12 +43,12 @@ /* * Read header information from EEPROM into global structure. */ -static int read_eeprom(void) +int draco_read_eeprom(void) { return 0; } -static void board_init_ddr(void) +void draco_init_ddr(void) { struct emif_regs rut_ddr3_emif_reg_data = { .sdram_config = 0x61C04AB2, @@ -125,7 +125,7 @@ err: #define REQUEST_AND_PULSE_RESET(N) \ request_and_pulse_reset(N, #N); -static void spl_siemens_board_init(void) +void spl_draco_board_init(void) { REQUEST_AND_PULSE_RESET(ETH_PHY_RESET_GPIO); REQUEST_AND_PULSE_RESET(MAXTOUCH_RESET_GPIO); @@ -245,5 +245,3 @@ int board_late_init(void) return 0; } #endif - -#include "../common/board.c" diff --git a/board/siemens/rut/board.h b/board/siemens/rut/board.h deleted file mode 100644 index 9067e4d..0000000 --- a/board/siemens/rut/board.h +++ /dev/null @@ -1,21 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * board.h - * - * (C) Copyright 2013 Siemens Schweiz AG - * (C) Heiko Schocher, DENX Software Engineering, hs@denx.de. - * - * Based on: - * TI AM335x boards information header - * u-boot:/board/ti/am335x/board.h - * - * Copyright (C) 2011, Texas Instruments, Incorporated - https://www.ti.com/ - */ - -#ifndef _BOARD_H_ -#define _BOARD_H_ - -void enable_uart0_pin_mux(void); -void enable_i2c0_pin_mux(void); -void enable_board_pin_mux(void); -#endif -- cgit v1.1