mirror of
https://github.com/torvalds/linux
synced 2024-09-27 23:10:58 +00:00
6515e48932
Currently, if, for example, CONFIG_ARCH_OMAP2420 is not selected, OMAP2420 board files can still be included in the build. This results in link errors: arch/arm/mach-omap2/built-in.o: In function `omap_generic_map_io': .../arch/arm/mach-omap2/board-generic.c:51: undefined reference to `omap2_set_globals_242x' arch/arm/mach-omap2/built-in.o: In function `omap_h4_init': .../arch/arm/mach-omap2/board-h4.c:330: undefined reference to `omap2420_mux_init' arch/arm/mach-omap2/built-in.o: In function `omap_h4_map_io': .../arch/arm/mach-omap2/board-h4.c:373: undefined reference to `omap2_set_globals_242x' arch/arm/mach-omap2/built-in.o: In function `omap_apollon_init': .../arch/arm/mach-omap2/board-apollon.c:325: undefined reference to `omap2420_mux_init' arch/arm/mach-omap2/built-in.o: In function `omap_apollon_map_io': .../arch/arm/mach-omap2/board-apollon.c:353: undefined reference to `omap2_set_globals_242x' make: *** [.tmp_vmlinux1] Error 1 Fix this by making the boards depend on the Kconfig option for the specific SoC that they use. Also, while here, fix the mach-omap2/board-generic.c file to remove the dependency on OMAP2420. Charulatha Varadarajan <charu@ti.com> caught a typo - thanks Charu. Signed-off-by: Paul Walmsley <paul@pwsan.com> Cc: Tony Lindgren <tony@atomide.com> Cc: Charulatha Varadarajan <charu@ti.com>
78 lines
2 KiB
C
78 lines
2 KiB
C
/*
|
|
* linux/arch/arm/mach-omap2/board-generic.c
|
|
*
|
|
* Copyright (C) 2005 Nokia Corporation
|
|
* Author: Paul Mundt <paul.mundt@nokia.com>
|
|
*
|
|
* Modified from mach-omap/omap1/board-generic.c
|
|
*
|
|
* Code for generic OMAP2 board. Should work on many OMAP2 systems where
|
|
* the bootloader passes the board-specific data to the kernel.
|
|
* Do not put any board specific code to this file; create a new machine
|
|
* type if you need custom low-level initializations.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/device.h>
|
|
|
|
#include <mach/hardware.h>
|
|
#include <asm/mach-types.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
|
|
#include <mach/gpio.h>
|
|
#include <plat/usb.h>
|
|
#include <plat/board.h>
|
|
#include <plat/common.h>
|
|
|
|
static struct omap_board_config_kernel generic_config[] = {
|
|
};
|
|
|
|
static void __init omap_generic_init_irq(void)
|
|
{
|
|
omap_board_config = generic_config;
|
|
omap_board_config_size = ARRAY_SIZE(generic_config);
|
|
omap2_init_common_hw(NULL, NULL);
|
|
omap_init_irq();
|
|
}
|
|
|
|
static void __init omap_generic_init(void)
|
|
{
|
|
omap_serial_init();
|
|
}
|
|
|
|
static void __init omap_generic_map_io(void)
|
|
{
|
|
if (cpu_is_omap242x()) {
|
|
omap2_set_globals_242x();
|
|
omap242x_map_common_io();
|
|
} else if (cpu_is_omap243x()) {
|
|
omap2_set_globals_243x();
|
|
omap243x_map_common_io();
|
|
} else if (cpu_is_omap34xx()) {
|
|
omap2_set_globals_3xxx();
|
|
omap34xx_map_common_io();
|
|
} else if (cpu_is_omap44xx()) {
|
|
omap2_set_globals_443x();
|
|
omap44xx_map_common_io();
|
|
}
|
|
}
|
|
|
|
/* XXX This machine entry name should be updated */
|
|
MACHINE_START(OMAP_GENERIC, "Generic OMAP24xx")
|
|
/* Maintainer: Paul Mundt <paul.mundt@nokia.com> */
|
|
.phys_io = 0x48000000,
|
|
.io_pg_offst = ((0xfa000000) >> 18) & 0xfffc,
|
|
.boot_params = 0x80000100,
|
|
.map_io = omap_generic_map_io,
|
|
.reserve = omap_reserve,
|
|
.init_irq = omap_generic_init_irq,
|
|
.init_machine = omap_generic_init,
|
|
.timer = &omap_timer,
|
|
MACHINE_END
|