diff options
Diffstat (limited to 'arch/arm/boards/phytec-phycore-omap4460/board.c')
-rw-r--r-- | arch/arm/boards/phytec-phycore-omap4460/board.c | 43 |
1 files changed, 14 insertions, 29 deletions
diff --git a/arch/arm/boards/phytec-phycore-omap4460/board.c b/arch/arm/boards/phytec-phycore-omap4460/board.c index b7aeeca6df..2a176f156e 100644 --- a/arch/arm/boards/phytec-phycore-omap4460/board.c +++ b/arch/arm/boards/phytec-phycore-omap4460/board.c @@ -1,18 +1,5 @@ -/* - * Copyright (C) 2011 Sascha Hauer, Pengutronix - * - * 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. - * - * - */ +// SPDX-License-Identifier: GPL-2.0-or-later +// SPDX-FileCopyrightText: 2011 Sascha Hauer, Pengutronix #include <common.h> #include <console.h> @@ -22,22 +9,21 @@ #include <io.h> #include <envfs.h> #include <asm/armlinux.h> -#include <generated/mach-types.h> -#include <mach/omap4-silicon.h> -#include <mach/omap4-devices.h> -#include <mach/omap4-clock.h> -#include <mach/omap-fb.h> -#include <mach/sdrc.h> -#include <mach/sys_info.h> -#include <mach/syslib.h> -#include <mach/control.h> +#include <asm/mach-types.h> +#include <mach/omap/devices.h> +#include <mach/omap/omap4-silicon.h> +#include <mach/omap/omap4-devices.h> +#include <mach/omap/omap4-clock.h> +#include <mach/omap/sdrc.h> +#include <mach/omap/sys_info.h> +#include <mach/omap/syslib.h> +#include <mach/omap/control.h> #include <linux/err.h> #include <linux/sizes.h> -#include <partition.h> #include <nand.h> #include <asm/mmu.h> -#include <mach/gpmc.h> -#include <mach/gpmc_nand.h> +#include <mach/omap/gpmc.h> +#include <mach/omap/gpmc_nand.h> #include <i2c/i2c.h> static int pcm049_console_init(void) @@ -305,8 +291,7 @@ static int pcm049_devices_init(void) armlinux_set_architecture(MACH_TYPE_PCM049); - if (IS_ENABLED(CONFIG_DRIVER_VIDEO_OMAP)) - omap_add_display(&pcm049_fb_data); + omap_add_display(&pcm049_fb_data); if (IS_ENABLED(CONFIG_DEFAULT_ENVIRONMENT_GENERIC)) defaultenv_append_directory(defaultenv_phytec_phycore_omap4460); |