sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

OMAP: Move bootsource functions 

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 <t.gamez@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Teresa Gámez 2013-04-02 14:48:06 +02:00 committed by Sascha Hauer
parent 28ce80f53c
commit c61cc98091
15 changed files with 55 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/boards/beagle/board.c
View File

@ -62,7 +62,6 @@
#include <i2c/i2c.h>
#include <linux/err.h>
#include <usb/ehci.h>
#include <mach/xload.h>
#ifdef CONFIG_DRIVER_SERIAL_NS16550

1
arch/arm/boards/beaglebone/board.c
View File

@ -45,7 +45,6 @@
#include <linux/err.h>
#include <linux/phy.h>
#include <usb/ehci.h>
#include <mach/xload.h>
#include <mach/am33xx-devices.h>
#include <mach/am33xx-mux.h>
#include <mach/wdt.h>

2
arch/arm/boards/panda/board.c
View File

@ -20,7 +20,7 @@
#include <asm/mmu.h>
#include <mach/gpio.h>
#include <envfs.h>
#include <mach/xload.h>
#include <mach/generic.h>
#include <i2c/i2c.h>
#include <gpio.h>
#include <led.h>

1
arch/arm/boards/pcm049/board.c
View File

@ -36,7 +36,6 @@
#include <mach/gpio.h>
#include <mach/gpmc.h>
#include <mach/gpmc_nand.h>
#include <mach/xload.h>
#include <i2c/i2c.h>
static int pcm049_console_init(void)

1
arch/arm/boards/phycard-a-l1/pca-a-l1.c
View File

@ -54,7 +54,6 @@
#include <mach/gpmc.h>
#include <mach/gpmc_nand.h>
#include <mach/omap_hsmmc.h>
#include <mach/xload.h>
#include <mach/sdrc.h>
#include <mach/omap3-silicon.h>
#include <mach/sys_info.h>

1
arch/arm/boards/phycard-a-xl2/pca-a-xl2.c
View File

@ -35,7 +35,6 @@
#include <mach/gpio.h>
#include <mach/gpmc.h>
#include <mach/gpmc_nand.h>
#include <mach/xload.h>
#include <mach/omap_hsmmc.h>
#include <mach/omap4-devices.h>
#include <i2c/i2c.h>

2
arch/arm/mach-omap/Makefile
View File

@ -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

2
arch/arm/mach-omap/am33xx_generic.c
View File

@ -24,7 +24,7 @@
#include <mach/am33xx-silicon.h>
#include <mach/am33xx-clock.h>
#include <mach/sys_info.h>
#include <mach/xload.h>
#include <mach/generic.h>
#include <mach/am33xx-generic.h>
void __noreturn reset_cpu(unsigned long addr)

16
arch/arm/mach-omap/include/mach/generic.h
View File

@ -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

16
arch/arm/mach-omap/include/mach/xload.h
View File

@ -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 */

2
arch/arm/mach-omap/omap3_generic.c
View File

@ -40,7 +40,7 @@
#include <mach/wdt.h>
#include <mach/sys_info.h>
#include <mach/syslib.h>
#include <mach/xload.h>
#include <mach/generic.h>
/**
* @brief Reset the CPU

2
arch/arm/mach-omap/omap4_generic.c
View File

@ -5,7 +5,7 @@
#include <mach/omap4-silicon.h>
#include <mach/omap4-mux.h>
#include <mach/syslib.h>
#include <mach/xload.h>
#include <mach/generic.h>
#include <mach/gpmc.h>
#include <mach/gpio.h>
#include <mach/omap4_rom_usb.h>

2
arch/arm/mach-omap/omap4_rom_usb.c
View File

@ -33,7 +33,7 @@
#include <common.h>
#include <mach/omap4-silicon.h>
#include <mach/omap4_rom_usb.h>
#include <mach/xload.h>
#include <mach/generic.h>
#include <init.h>
static struct omap4_usbboot omap4_usbboot_data;

32
arch/arm/mach-omap/omap_generic.c Normal file
View File

@ -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 <common.h>
#include <envfs.h>
#include <init.h>
#include <io.h>
#include <fs.h>
#include <linux/stat.h>
#include <mach/generic.h>
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
}

13
arch/arm/mach-omap/xload.c
View File

@ -6,7 +6,7 @@
#include <linux/mtd/mtd.h>
#include <fs.h>
#include <fcntl.h>
#include <mach/xload.h>
#include <mach/generic.h>
#include <sizes.h>
#include <filetype.h>
@ -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
*/