diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/Kconfig | 1 | ||||
| -rw-r--r-- | common/board_r.c | 4 | ||||
| -rw-r--r-- | common/cros_ec.c | 2 | ||||
| -rw-r--r-- | common/lynxkdi.c | 2 | ||||
| -rw-r--r-- | common/main.c | 2 | ||||
| -rw-r--r-- | common/spl/Kconfig | 6 | ||||
| -rw-r--r-- | common/spl/spl.c | 2 | ||||
| -rw-r--r-- | common/spl/spl_mmc.c | 2 | ||||
| -rw-r--r-- | common/spl/spl_net.c | 2 | ||||
| -rw-r--r-- | common/spl/spl_sata.c | 2 | ||||
| -rw-r--r-- | common/spl/spl_sdp.c | 2 | ||||
| -rw-r--r-- | common/spl/spl_usb.c | 2 | ||||
| -rw-r--r-- | common/usb_hub.c | 2 |
13 files changed, 11 insertions, 20 deletions
diff --git a/common/Kconfig b/common/Kconfig index 03eeeb24025..4c7a1a9af86 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -424,6 +424,7 @@ menu "Logging" config LOG bool "Enable logging support" + select DM help This enables support for logging of status and debug messages. These can be displayed on the console, recorded in a memory buffer, or diff --git a/common/board_r.c b/common/board_r.c index 0f4479a58bc..7a3d4ca088e 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -386,8 +386,8 @@ static int initr_flash(void) #if defined(CONFIG_PPC) && !defined(CONFIG_DM_SPI) static int initr_spi(void) { - /* PPC does this here */ -#ifdef CONFIG_SPI + /* MPC8xx does this here */ +#ifdef CONFIG_MPC8XX_SPI #if !defined(CONFIG_ENV_IS_IN_EEPROM) spi_init_f(); #endif diff --git a/common/cros_ec.c b/common/cros_ec.c index 7a4f785bc83..1a0caf80dde 100644 --- a/common/cros_ec.c +++ b/common/cros_ec.c @@ -13,8 +13,6 @@ #include <dm.h> #include <errno.h> -DECLARE_GLOBAL_DATA_PTR; - struct cros_ec_dev *board_get_cros_ec_dev(void) { struct udevice *dev; diff --git a/common/lynxkdi.c b/common/lynxkdi.c index f2b95ac8d37..1c8e122c329 100644 --- a/common/lynxkdi.c +++ b/common/lynxkdi.c @@ -20,6 +20,4 @@ #include <lynxkdi.h> -DECLARE_GLOBAL_DATA_PTR; - #error "Lynx KDI support not implemented for configured CPU" diff --git a/common/main.c b/common/main.c index 6a1159879ed..66a03a156eb 100644 --- a/common/main.c +++ b/common/main.c @@ -13,8 +13,6 @@ #include <console.h> #include <version.h> -DECLARE_GLOBAL_DATA_PTR; - /* * Board-specific Platform code can reimplement show_boot_progress () if needed */ diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 4d275655660..259f96607ea 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -626,6 +626,8 @@ config SPL_SATA_SUPPORT config SPL_SERIAL_SUPPORT bool "Support serial" + select SPL_PRINTF + select SPL_STRTO help Enable support for serial in SPL. This allows use of a serial UART for displaying messages while SPL is running. It also brings in @@ -751,6 +753,7 @@ config SPL_WATCHDOG_SUPPORT config SPL_YMODEM_SUPPORT bool "Support loading using Ymodem" + depends on SPL_SERIAL_SUPPORT help While loading from serial is slow it can be a useful backup when there is no other option. The Ymodem protocol provides a reliable @@ -926,6 +929,8 @@ config TPL_RAM_DEVICE config TPL_SERIAL_SUPPORT bool "Support serial" + select TPL_PRINTF + select TPL_STRTO help Enable support for serial in TPL. See SPL_SERIAL_SUPPORT for details. @@ -951,6 +956,7 @@ config TPL_SPI_SUPPORT config TPL_YMODEM_SUPPORT bool "Support loading using Ymodem" + depends on TPL_SERIAL_SUPPORT help While loading from serial is slow it can be a useful backup when there is no other option. The Ymodem protocol provides a reliable diff --git a/common/spl/spl.c b/common/spl/spl.c index 61d3071324b..794dbd03124 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -471,6 +471,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2) jump_to_image_no_args(&spl_image); } +#ifdef CONFIG_SPL_SERIAL_SUPPORT /* * This requires UART clocks to be enabled. In order for this to work the * caller must ensure that the gd pointer is valid. @@ -491,6 +492,7 @@ void preloader_console_init(void) spl_display_print(); #endif } +#endif /** * spl_relocate_stack_gd() - Relocate stack ready for board_init_r() execution diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index 4aa0b2caf39..e780b82fd2b 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -16,8 +16,6 @@ #include <mmc.h> #include <image.h> -DECLARE_GLOBAL_DATA_PTR; - static int mmc_load_legacy(struct spl_image_info *spl_image, struct mmc *mmc, ulong sector, struct image_header *header) { diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c index 50d02478d51..33f3b74a970 100644 --- a/common/spl/spl_net.c +++ b/common/spl/spl_net.c @@ -13,8 +13,6 @@ #include <net.h> #include <linux/libfdt.h> -DECLARE_GLOBAL_DATA_PTR; - #if defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER) static ulong spl_net_load_read(struct spl_load_info *load, ulong sector, ulong count, void *buf) diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c index bac11f64f13..357f8e5bd96 100644 --- a/common/spl/spl_sata.c +++ b/common/spl/spl_sata.c @@ -18,8 +18,6 @@ #include <fat.h> #include <image.h> -DECLARE_GLOBAL_DATA_PTR; - static int spl_sata_load_image(struct spl_image_info *spl_image, struct spl_boot_device *bootdev) { diff --git a/common/spl/spl_sdp.c b/common/spl/spl_sdp.c index 0c4603a3db3..69390edcbae 100644 --- a/common/spl/spl_sdp.c +++ b/common/spl/spl_sdp.c @@ -11,8 +11,6 @@ #include <g_dnl.h> #include <sdp.h> -DECLARE_GLOBAL_DATA_PTR; - static int spl_sdp_load_image(struct spl_image_info *spl_image, struct spl_boot_device *bootdev) { diff --git a/common/spl/spl_usb.c b/common/spl/spl_usb.c index 567a4505056..5aac10bd573 100644 --- a/common/spl/spl_usb.c +++ b/common/spl/spl_usb.c @@ -16,8 +16,6 @@ #include <usb.h> #include <fat.h> -DECLARE_GLOBAL_DATA_PTR; - #ifdef CONFIG_USB_STORAGE static int usb_stor_curr_dev = -1; /* current device */ #endif diff --git a/common/usb_hub.c b/common/usb_hub.c index b46dfa16ccf..0729a20df48 100644 --- a/common/usb_hub.c +++ b/common/usb_hub.c @@ -37,8 +37,6 @@ #endif #include <asm/unaligned.h> -DECLARE_GLOBAL_DATA_PTR; - #include <usb.h> #define USB_BUFSIZ 512 |