diff options
author | Tom Rini <trini@konsulko.com> | 2024-05-18 20:20:43 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2024-05-19 08:16:36 -0600 |
commit | d678a59d2d719da9e807495b4b021501f2836ca5 (patch) | |
tree | 313e5c32e3d02d3cf1904875b1655140973126e9 /board/ti | |
parent | 3be9f399e911cfc437a37ac826441f1d96da1c9b (diff) | |
download | u-boot-d678a59d2d719da9e807495b4b021501f2836ca5.zip u-boot-d678a59d2d719da9e807495b4b021501f2836ca5.tar.gz u-boot-d678a59d2d719da9e807495b4b021501f2836ca5.tar.bz2 |
Revert "Merge patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet""
When bringing in the series 'arm: dts: am62-beagleplay: Fix Beagleplay
Ethernet"' I failed to notice that b4 noticed it was based on next and
so took that as the base commit and merged that part of next to master.
This reverts commit c8ffd1356d42223cbb8c86280a083cc3c93e6426, reversing
changes made to 2ee6f3a5f7550de3599faef9704e166e5dcace35.
Reported-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'board/ti')
-rw-r--r-- | board/ti/am335x/board.c | 2 | ||||
-rw-r--r-- | board/ti/am335x/board.h | 2 | ||||
-rw-r--r-- | board/ti/am335x/mux.c | 2 | ||||
-rw-r--r-- | board/ti/am43xx/board.c | 3 | ||||
-rw-r--r-- | board/ti/am43xx/board.h | 1 | ||||
-rw-r--r-- | board/ti/am43xx/mux.c | 1 | ||||
-rw-r--r-- | board/ti/am57xx/board.c | 2 | ||||
-rw-r--r-- | board/ti/common/board_detect.c | 3 | ||||
-rw-r--r-- | board/ti/common/cape_detect.c | 3 | ||||
-rw-r--r-- | board/ti/dra7xx/evm.c | 2 | ||||
-rw-r--r-- | board/ti/ks2_evm/board.c | 2 | ||||
-rw-r--r-- | board/ti/ks2_evm/board_k2e.c | 1 | ||||
-rw-r--r-- | board/ti/ks2_evm/board_k2g.c | 3 | ||||
-rw-r--r-- | board/ti/ks2_evm/board_k2hk.c | 1 | ||||
-rw-r--r-- | board/ti/ks2_evm/board_k2l.c | 1 | ||||
-rw-r--r-- | board/ti/ks2_evm/ddr3_cfg.c | 1 | ||||
-rw-r--r-- | board/ti/ks2_evm/ddr3_k2e.c | 1 | ||||
-rw-r--r-- | board/ti/ks2_evm/ddr3_k2g.c | 1 | ||||
-rw-r--r-- | board/ti/ks2_evm/ddr3_k2hk.c | 1 | ||||
-rw-r--r-- | board/ti/ks2_evm/ddr3_k2l.c | 1 | ||||
-rw-r--r-- | board/ti/omap3evm/evm.c | 2 | ||||
-rw-r--r-- | board/ti/panda/panda.c | 1 | ||||
-rw-r--r-- | board/ti/sdp4430/cmd_bat.c | 1 | ||||
-rw-r--r-- | board/ti/sdp4430/sdp.c | 1 |
24 files changed, 25 insertions, 14 deletions
diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index 34f4a91..34f987c 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -7,7 +7,7 @@ * Copyright (C) 2011, Texas Instruments, Incorporated - https://www.ti.com/ */ -#include <config.h> +#include <common.h> #include <dm.h> #include <env.h> #include <errno.h> diff --git a/board/ti/am335x/board.h b/board/ti/am335x/board.h index b0a3842..1284c16 100644 --- a/board/ti/am335x/board.h +++ b/board/ti/am335x/board.h @@ -10,8 +10,6 @@ #ifndef _BOARD_H_ #define _BOARD_H_ -#include <linux/string.h> - /** * AM335X (EMIF_4D) EMIF REG_COS_COUNT_1, REG_COS_COUNT_2, and * REG_PR_OLD_COUNT values to avoid LCDC DMA FIFO underflows and Frame diff --git a/board/ti/am335x/mux.c b/board/ti/am335x/mux.c index 960de15..0bad154 100644 --- a/board/ti/am335x/mux.c +++ b/board/ti/am335x/mux.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <config.h> +#include <common.h> #include <asm/arch/sys_proto.h> #include <asm/arch/hardware.h> #include <asm/arch/mux.h> diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c index 40b7fcf..a4679a2 100644 --- a/board/ti/am43xx/board.c +++ b/board/ti/am43xx/board.c @@ -7,7 +7,8 @@ * Copyright (C) 2013, Texas Instruments, Incorporated - https://www.ti.com/ */ -#include <config.h> +#include <common.h> +#include <eeprom.h> #include <asm/global_data.h> #include <dm/uclass.h> #include <env.h> diff --git a/board/ti/am43xx/board.h b/board/ti/am43xx/board.h index b1025bd..37a169a 100644 --- a/board/ti/am43xx/board.h +++ b/board/ti/am43xx/board.h @@ -11,7 +11,6 @@ #ifndef _BOARD_H_ #define _BOARD_H_ -#include <linux/string.h> #include <asm/arch/omap.h> #define DEV_ATTR_MAX_OFFSET 5 diff --git a/board/ti/am43xx/mux.c b/board/ti/am43xx/mux.c index 2fcccbd..463f1cc 100644 --- a/board/ti/am43xx/mux.c +++ b/board/ti/am43xx/mux.c @@ -5,6 +5,7 @@ * Copyright (C) 2013 Texas Instruments Incorporated - https://www.ti.com/ */ +#include <common.h> #include <asm/arch/sys_proto.h> #include <asm/arch/mux.h> #include "../common/board_detect.h" diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c index 4866888..b004a89 100644 --- a/board/ti/am57xx/board.c +++ b/board/ti/am57xx/board.c @@ -7,7 +7,7 @@ * Based on board/ti/dra7xx/evm.c */ -#include <config.h> +#include <common.h> #include <env.h> #include <fastboot.h> #include <fdt_support.h> diff --git a/board/ti/common/board_detect.c b/board/ti/common/board_detect.c index ea21d48..38e23cc 100644 --- a/board/ti/common/board_detect.c +++ b/board/ti/common/board_detect.c @@ -7,9 +7,10 @@ * Steve Kipisz */ +#include <common.h> +#include <eeprom.h> #include <log.h> #include <net.h> -#include <linux/types.h> #include <asm/arch/hardware.h> #include <asm/omap_common.h> #include <dm/uclass.h> diff --git a/board/ti/common/cape_detect.c b/board/ti/common/cape_detect.c index da805be..2e6105c 100644 --- a/board/ti/common/cape_detect.c +++ b/board/ti/common/cape_detect.c @@ -4,11 +4,10 @@ * Köry Maincent, Bootlin, <kory.maincent@bootlin.com> */ -#include <stdio.h> +#include <common.h> #include <malloc.h> #include <i2c.h> #include <extension_board.h> -#include <vsprintf.h> #include "cape_detect.h" diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c index 2b1db25..a8a216d 100644 --- a/board/ti/dra7xx/evm.c +++ b/board/ti/dra7xx/evm.c @@ -9,7 +9,7 @@ * Aneesh V <aneesh@ti.com> * Steve Sakoman <steve@sakoman.com> */ -#include <config.h> +#include <common.h> #include <env.h> #include <fdt_support.h> #include <fastboot.h> diff --git a/board/ti/ks2_evm/board.c b/board/ti/ks2_evm/board.c index c6735d3..5dcda12 100644 --- a/board/ti/ks2_evm/board.c +++ b/board/ti/ks2_evm/board.c @@ -6,7 +6,7 @@ * Texas Instruments Incorporated, <www.ti.com> */ -#include <config.h> +#include <common.h> #include <asm/global_data.h> #include "board.h" #include <env.h> diff --git a/board/ti/ks2_evm/board_k2e.c b/board/ti/ks2_evm/board_k2e.c index 4385be4..39abb24 100644 --- a/board/ti/ks2_evm/board_k2e.c +++ b/board/ti/ks2_evm/board_k2e.c @@ -6,6 +6,7 @@ * Texas Instruments Incorporated, <www.ti.com> */ +#include <common.h> #include <image.h> #include <init.h> #include <asm/arch/ddr3.h> diff --git a/board/ti/ks2_evm/board_k2g.c b/board/ti/ks2_evm/board_k2g.c index d07b77d..5229afa 100644 --- a/board/ti/ks2_evm/board_k2g.c +++ b/board/ti/ks2_evm/board_k2g.c @@ -5,7 +5,8 @@ * (C) Copyright 2015 * Texas Instruments Incorporated, <www.ti.com> */ -#include <config.h> +#include <common.h> +#include <eeprom.h> #include <env.h> #include <hang.h> #include <image.h> diff --git a/board/ti/ks2_evm/board_k2hk.c b/board/ti/ks2_evm/board_k2hk.c index 2b5d2d7..12c4649 100644 --- a/board/ti/ks2_evm/board_k2hk.c +++ b/board/ti/ks2_evm/board_k2hk.c @@ -6,6 +6,7 @@ * Texas Instruments Incorporated, <www.ti.com> */ +#include <common.h> #include <image.h> #include <init.h> #include <asm/arch/clock.h> diff --git a/board/ti/ks2_evm/board_k2l.c b/board/ti/ks2_evm/board_k2l.c index 1971bc9..f759ee3 100644 --- a/board/ti/ks2_evm/board_k2l.c +++ b/board/ti/ks2_evm/board_k2l.c @@ -6,6 +6,7 @@ * Texas Instruments Incorporated, <www.ti.com> */ +#include <common.h> #include <image.h> #include <init.h> #include <asm/arch/ddr3.h> diff --git a/board/ti/ks2_evm/ddr3_cfg.c b/board/ti/ks2_evm/ddr3_cfg.c index fe350fe..0ade752 100644 --- a/board/ti/ks2_evm/ddr3_cfg.c +++ b/board/ti/ks2_evm/ddr3_cfg.c @@ -6,6 +6,7 @@ * Texas Instruments Incorporated, <www.ti.com> */ +#include <common.h> #include <asm/arch/ddr3.h> #include "ddr3_cfg.h" diff --git a/board/ti/ks2_evm/ddr3_k2e.c b/board/ti/ks2_evm/ddr3_k2e.c index 2830532..95fe3a9 100644 --- a/board/ti/ks2_evm/ddr3_k2e.c +++ b/board/ti/ks2_evm/ddr3_k2e.c @@ -6,6 +6,7 @@ * Texas Instruments Incorporated, <www.ti.com> */ +#include <common.h> #include "ddr3_cfg.h" #include <asm/arch/ddr3.h> diff --git a/board/ti/ks2_evm/ddr3_k2g.c b/board/ti/ks2_evm/ddr3_k2g.c index ef39e07..3000d724 100644 --- a/board/ti/ks2_evm/ddr3_k2g.c +++ b/board/ti/ks2_evm/ddr3_k2g.c @@ -6,6 +6,7 @@ * Texas Instruments Incorporated, <www.ti.com> */ +#include <common.h> #include "ddr3_cfg.h" #include <asm/arch/ddr3.h> #include <asm/arch/hardware.h> diff --git a/board/ti/ks2_evm/ddr3_k2hk.c b/board/ti/ks2_evm/ddr3_k2hk.c index 05c050c..198c5da 100644 --- a/board/ti/ks2_evm/ddr3_k2hk.c +++ b/board/ti/ks2_evm/ddr3_k2hk.c @@ -6,6 +6,7 @@ * Texas Instruments Incorporated, <www.ti.com> */ +#include <common.h> #include "ddr3_cfg.h" #include <asm/arch/ddr3.h> #include <asm/arch/hardware.h> diff --git a/board/ti/ks2_evm/ddr3_k2l.c b/board/ti/ks2_evm/ddr3_k2l.c index aa6d45f..805bf81 100644 --- a/board/ti/ks2_evm/ddr3_k2l.c +++ b/board/ti/ks2_evm/ddr3_k2l.c @@ -6,6 +6,7 @@ * Texas Instruments Incorporated, <www.ti.com> */ +#include <common.h> #include "ddr3_cfg.h" #include <asm/arch/ddr3.h> diff --git a/board/ti/omap3evm/evm.c b/board/ti/omap3evm/evm.c index 4eb08ad..a4d6a01 100644 --- a/board/ti/omap3evm/evm.c +++ b/board/ti/omap3evm/evm.c @@ -10,7 +10,7 @@ * Richard Woodruff <r-woodruff2@ti.com> * Syed Mohammed Khasim <khasim@ti.com> */ -#include <config.h> +#include <common.h> #include <dm.h> #include <env.h> #include <init.h> diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c index e47d3a9..2209318 100644 --- a/board/ti/panda/panda.c +++ b/board/ti/panda/panda.c @@ -4,6 +4,7 @@ * Texas Instruments Incorporated, <www.ti.com> * Steve Sakoman <steve@sakoman.com> */ +#include <common.h> #include <init.h> #include <log.h> #include <net.h> diff --git a/board/ti/sdp4430/cmd_bat.c b/board/ti/sdp4430/cmd_bat.c index 6bf44d9..6c1e6ca 100644 --- a/board/ti/sdp4430/cmd_bat.c +++ b/board/ti/sdp4430/cmd_bat.c @@ -3,6 +3,7 @@ * Copyright (C) 2010 Texas Instruments */ +#include <common.h> #include <command.h> #ifdef CONFIG_CMD_BAT diff --git a/board/ti/sdp4430/sdp.c b/board/ti/sdp4430/sdp.c index 1a71390..2c9ae79 100644 --- a/board/ti/sdp4430/sdp.c +++ b/board/ti/sdp4430/sdp.c @@ -5,6 +5,7 @@ * Aneesh V <aneesh@ti.com> * Steve Sakoman <steve@sakoman.com> */ +#include <common.h> #include <init.h> #include <net.h> #include <twl6030.h> |