From c61cc9809129d31295b9069f76368917db3523ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Teresa=20G=C3=A1mez?= Date: Tue, 2 Apr 2013 14:48:06 +0200 Subject: [PATCH] OMAP: Move bootsource functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The bootsource functions are not specific to the first stage bootloader. They may also be used for detecting the bootsource to decide where to load the environment from. Also clean up includes in board files. Signed-off-by: Teresa Gámez Signed-off-by: Sascha Hauer --- arch/arm/boards/beagle/board.c | 1 - arch/arm/boards/beaglebone/board.c | 1 - arch/arm/boards/panda/board.c | 2 +- arch/arm/boards/pcm049/board.c | 1 - arch/arm/boards/phycard-a-l1/pca-a-l1.c | 1 - arch/arm/boards/phycard-a-xl2/pca-a-xl2.c | 1 - arch/arm/mach-omap/Makefile | 2 +- arch/arm/mach-omap/am33xx_generic.c | 2 +- arch/arm/mach-omap/include/mach/generic.h | 16 ++++++++++++ arch/arm/mach-omap/include/mach/xload.h | 16 ------------ arch/arm/mach-omap/omap3_generic.c | 2 +- arch/arm/mach-omap/omap4_generic.c | 2 +- arch/arm/mach-omap/omap4_rom_usb.c | 2 +- arch/arm/mach-omap/omap_generic.c | 32 +++++++++++++++++++++++ arch/arm/mach-omap/xload.c | 13 +-------- 15 files changed, 55 insertions(+), 39 deletions(-) delete mode 100644 arch/arm/mach-omap/include/mach/xload.h create mode 100644 arch/arm/mach-omap/omap_generic.c diff --git a/arch/arm/boards/beagle/board.c b/arch/arm/boards/beagle/board.c index bed465199..972c05efb 100644 --- a/arch/arm/boards/beagle/board.c +++ b/arch/arm/boards/beagle/board.c @@ -62,7 +62,6 @@ #include #include #include -#include #ifdef CONFIG_DRIVER_SERIAL_NS16550 diff --git a/arch/arm/boards/beaglebone/board.c b/arch/arm/boards/beaglebone/board.c index 70c60705b..3f2145368 100644 --- a/arch/arm/boards/beaglebone/board.c +++ b/arch/arm/boards/beaglebone/board.c @@ -45,7 +45,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/arm/boards/panda/board.c b/arch/arm/boards/panda/board.c index f1fbd5e94..2518d3a0c 100644 --- a/arch/arm/boards/panda/board.c +++ b/arch/arm/boards/panda/board.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/boards/pcm049/board.c b/arch/arm/boards/pcm049/board.c index 680539a22..b0d689bf0 100644 --- a/arch/arm/boards/pcm049/board.c +++ b/arch/arm/boards/pcm049/board.c @@ -36,7 +36,6 @@ #include #include #include -#include #include static int pcm049_console_init(void) diff --git a/arch/arm/boards/phycard-a-l1/pca-a-l1.c b/arch/arm/boards/phycard-a-l1/pca-a-l1.c index 234d689f9..7cf6ae863 100644 --- a/arch/arm/boards/phycard-a-l1/pca-a-l1.c +++ b/arch/arm/boards/phycard-a-l1/pca-a-l1.c @@ -54,7 +54,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/arm/boards/phycard-a-xl2/pca-a-xl2.c b/arch/arm/boards/phycard-a-xl2/pca-a-xl2.c index be7060fdd..8f79d98fb 100644 --- a/arch/arm/boards/phycard-a-xl2/pca-a-xl2.c +++ b/arch/arm/boards/phycard-a-xl2/pca-a-xl2.c @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/arm/mach-omap/Makefile b/arch/arm/mach-omap/Makefile index 38786b2bd..d9e00f77a 100644 --- a/arch/arm/mach-omap/Makefile +++ b/arch/arm/mach-omap/Makefile @@ -15,7 +15,7 @@ # GNU General Public License for more details. # # -obj-$(CONFIG_ARCH_OMAP) += syslib.o omap_devices.o +obj-$(CONFIG_ARCH_OMAP) += syslib.o omap_devices.o omap_generic.o pbl-$(CONFIG_ARCH_OMAP) += syslib.o obj-$(CONFIG_OMAP_CLOCK_SOURCE_S32K) += s32k_clksource.o obj-$(CONFIG_OMAP_CLOCK_SOURCE_DMTIMER0) += dmtimer0.o diff --git a/arch/arm/mach-omap/am33xx_generic.c b/arch/arm/mach-omap/am33xx_generic.c index d3014c20b..059c55e3b 100644 --- a/arch/arm/mach-omap/am33xx_generic.c +++ b/arch/arm/mach-omap/am33xx_generic.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include void __noreturn reset_cpu(unsigned long addr) diff --git a/arch/arm/mach-omap/include/mach/generic.h b/arch/arm/mach-omap/include/mach/generic.h index c801a068e..edc4f1d3d 100644 --- a/arch/arm/mach-omap/include/mach/generic.h +++ b/arch/arm/mach-omap/include/mach/generic.h @@ -1,3 +1,5 @@ +#ifndef _MACH_GENERIC_H +#define _MACH_GENERIC_H /* I2C controller revisions */ #define OMAP_I2C_REV_2 0x20 @@ -24,3 +26,17 @@ #else #define cpu_is_omap4xxx() (0) #endif + +enum omap_boot_src { + OMAP_BOOTSRC_UNKNOWN, + OMAP_BOOTSRC_MMC1, + OMAP_BOOTSRC_NAND, + OMAP_BOOTSRC_SPI1, + OMAP_BOOTSRC_USB1, +}; + +enum omap_boot_src am33xx_bootsrc(void); +enum omap_boot_src omap3_bootsrc(void); +enum omap_boot_src omap4_bootsrc(void); + +#endif diff --git a/arch/arm/mach-omap/include/mach/xload.h b/arch/arm/mach-omap/include/mach/xload.h deleted file mode 100644 index d63273526..000000000 --- a/arch/arm/mach-omap/include/mach/xload.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef _MACH_XLOAD_H -#define _MACH_XLOAD_H - -enum omap_boot_src { - OMAP_BOOTSRC_UNKNOWN, - OMAP_BOOTSRC_MMC1, - OMAP_BOOTSRC_NAND, - OMAP_BOOTSRC_SPI1, - OMAP_BOOTSRC_USB1, -}; - -enum omap_boot_src am33xx_bootsrc(void); -enum omap_boot_src omap3_bootsrc(void); -enum omap_boot_src omap4_bootsrc(void); - -#endif /* _MACH_XLOAD_H */ diff --git a/arch/arm/mach-omap/omap3_generic.c b/arch/arm/mach-omap/omap3_generic.c index a21a938ef..10e03aec0 100644 --- a/arch/arm/mach-omap/omap3_generic.c +++ b/arch/arm/mach-omap/omap3_generic.c @@ -40,7 +40,7 @@ #include #include #include -#include +#include /** * @brief Reset the CPU diff --git a/arch/arm/mach-omap/omap4_generic.c b/arch/arm/mach-omap/omap4_generic.c index 2a09eb635..e1edffa35 100644 --- a/arch/arm/mach-omap/omap4_generic.c +++ b/arch/arm/mach-omap/omap4_generic.c @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/mach-omap/omap4_rom_usb.c b/arch/arm/mach-omap/omap4_rom_usb.c index de35d61c1..31d93c34e 100644 --- a/arch/arm/mach-omap/omap4_rom_usb.c +++ b/arch/arm/mach-omap/omap4_rom_usb.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include static struct omap4_usbboot omap4_usbboot_data; diff --git a/arch/arm/mach-omap/omap_generic.c b/arch/arm/mach-omap/omap_generic.c new file mode 100644 index 000000000..f2fd1d33a --- /dev/null +++ b/arch/arm/mach-omap/omap_generic.c @@ -0,0 +1,32 @@ +/* + * (C) Copyright 2013 Teresa Gámez, Phytec Messtechnik GmbH + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ +#include +#include +#include +#include +#include +#include +#include + +enum omap_boot_src omap_bootsrc(void) +{ +#if defined(CONFIG_ARCH_OMAP3) + return omap3_bootsrc(); +#elif defined(CONFIG_ARCH_OMAP4) + return omap4_bootsrc(); +#elif defined(CONFIG_ARCH_AM33XX) + return am33xx_bootsrc(); +#endif +} diff --git a/arch/arm/mach-omap/xload.c b/arch/arm/mach-omap/xload.c index 41533a968..72aa3791e 100644 --- a/arch/arm/mach-omap/xload.c +++ b/arch/arm/mach-omap/xload.c @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include @@ -158,17 +158,6 @@ static void *omap4_xload_boot_usb(void){ return buf; } -enum omap_boot_src omap_bootsrc(void) -{ -#if defined(CONFIG_ARCH_OMAP3) - return omap3_bootsrc(); -#elif defined(CONFIG_ARCH_OMAP4) - return omap4_bootsrc(); -#elif defined(CONFIG_ARCH_AM33XX) - return am33xx_bootsrc(); -#endif -} - /* * Replaces the default shell in xload configuration */