This board was merged in 2014 and had no active maintenance since then. No defconfig even builds this board, so remove it.
Signed-off-by: Sascha Hauer <[email protected]> --- arch/arm/boards/Makefile | 1 - arch/arm/boards/mx31moboard/Makefile | 5 - arch/arm/boards/mx31moboard/env/boot/nor | 4 - arch/arm/boards/mx31moboard/env/boot/sd | 3 - arch/arm/boards/mx31moboard/env/boot/usbmsd | 3 - .../boards/mx31moboard/env/init/mtdparts-nor | 6 - .../boards/mx31moboard/env/nv/boot.default | 1 - arch/arm/boards/mx31moboard/lowlevel.c | 98 ------- arch/arm/boards/mx31moboard/mx31moboard.c | 246 ------------------ arch/arm/mach-imx/Kconfig | 10 - 10 files changed, 377 deletions(-) delete mode 100644 arch/arm/boards/mx31moboard/Makefile delete mode 100644 arch/arm/boards/mx31moboard/env/boot/nor delete mode 100644 arch/arm/boards/mx31moboard/env/boot/sd delete mode 100644 arch/arm/boards/mx31moboard/env/boot/usbmsd delete mode 100644 arch/arm/boards/mx31moboard/env/init/mtdparts-nor delete mode 100644 arch/arm/boards/mx31moboard/env/nv/boot.default delete mode 100644 arch/arm/boards/mx31moboard/lowlevel.c delete mode 100644 arch/arm/boards/mx31moboard/mx31moboard.c diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile index 5713ef9e51..40b0af8d30 100644 --- a/arch/arm/boards/Makefile +++ b/arch/arm/boards/Makefile @@ -75,7 +75,6 @@ obj-$(CONFIG_MACH_MB7707) += module-mb7707/ obj-$(CONFIG_MACH_MIOA701) += mioa701/ obj-$(CONFIG_MACH_MX23EVK) += freescale-mx23-evk/ obj-$(CONFIG_MACH_MX28EVK) += freescale-mx28-evk/ -obj-$(CONFIG_MACH_MX31MOBOARD) += mx31moboard/ obj-$(CONFIG_MACH_NESO) += guf-neso/ obj-$(CONFIG_MACH_NETGEAR_RN104) += netgear-rn104/ obj-$(CONFIG_MACH_NETGEAR_RN2120) += netgear-rn2120/ diff --git a/arch/arm/boards/mx31moboard/Makefile b/arch/arm/boards/mx31moboard/Makefile deleted file mode 100644 index 17f4aa47ee..0000000000 --- a/arch/arm/boards/mx31moboard/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -// SPDX-FileCopyrightText: 2007 Juergen Beisert <[email protected]> - -lwl-y += lowlevel.o -obj-y += mx31moboard.o diff --git a/arch/arm/boards/mx31moboard/env/boot/nor b/arch/arm/boards/mx31moboard/env/boot/nor deleted file mode 100644 index f584307d7a..0000000000 --- a/arch/arm/boards/mx31moboard/env/boot/nor +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -global.bootm.image="/dev/nor0.kernel" -global.linux.bootargs.dyn.root="root=/dev/mtdblock3 ro" diff --git a/arch/arm/boards/mx31moboard/env/boot/sd b/arch/arm/boards/mx31moboard/env/boot/sd deleted file mode 100644 index a0c4da9e78..0000000000 --- a/arch/arm/boards/mx31moboard/env/boot/sd +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -boot mci0 diff --git a/arch/arm/boards/mx31moboard/env/boot/usbmsd b/arch/arm/boards/mx31moboard/env/boot/usbmsd deleted file mode 100644 index 208921da26..0000000000 --- a/arch/arm/boards/mx31moboard/env/boot/usbmsd +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -boot ehci0 diff --git a/arch/arm/boards/mx31moboard/env/init/mtdparts-nor b/arch/arm/boards/mx31moboard/env/init/mtdparts-nor deleted file mode 100644 index ab5b175c37..0000000000 --- a/arch/arm/boards/mx31moboard/env/init/mtdparts-nor +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -mtdparts="512k(nor0.barebox)ro,256k(nor0.bareboxenv),4M(nor0.kernel),-(nor0.root)" -kernelname="physmap-flash.0" - -mtdparts-add -d nor0 -k ${kernelname} -p ${mtdparts} diff --git a/arch/arm/boards/mx31moboard/env/nv/boot.default b/arch/arm/boards/mx31moboard/env/nv/boot.default deleted file mode 100644 index 7957ab340c..0000000000 --- a/arch/arm/boards/mx31moboard/env/nv/boot.default +++ /dev/null @@ -1 +0,0 @@ -usbmsd sd nor diff --git a/arch/arm/boards/mx31moboard/lowlevel.c b/arch/arm/boards/mx31moboard/lowlevel.c deleted file mode 100644 index cec98f34c1..0000000000 --- a/arch/arm/boards/mx31moboard/lowlevel.c +++ /dev/null @@ -1,98 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -// SPDX-FileCopyrightText: 2007 Sascha Hauer <[email protected]>, Pengutronix -// SPDX-FileCopyrightText: 2014 Philippe Rétornaz <[email protected]>, EPFL - -#include <common.h> -#include <init.h> -#include <io.h> -#include <asm/barebox-arm.h> -#include <asm/system.h> -#include <asm-generic/memory_layout.h> -#include <asm-generic/sections.h> -#include <asm/barebox-arm-head.h> -#include <mach/imx31-regs.h> -#include <mach/imx-pll.h> -#include <mach/esdctl.h> - -static noinline __noreturn void mx31moboard_startup(void) -{ - uint32_t r; - volatile int c; - - /* Enable IPU Display interface */ - writel(1 << 6, MX31_IPU_CTRL_BASE_ADDR); - - writel(0x074B0BF5, MX31_CCM_BASE_ADDR + MX31_CCM_CCMR); - - for (c = 0; c < 0x4000; c++) ; - - writel(0x074B0BF5 | MX31_CCMR_MPE, MX31_CCM_BASE_ADDR + - MX31_CCM_CCMR); - writel((0x074B0BF5 | MX31_CCMR_MPE) & ~MX31_CCMR_MDS, - MX31_CCM_BASE_ADDR + MX31_CCM_CCMR); - - writel(MX31_PDR0_CSI_PODF(0x1ff) | \ - MX31_PDR0_PER_PODF(7) | \ - MX31_PDR0_HSP_PODF(3) | \ - MX31_PDR0_NFC_PODF(5) | \ - MX31_PDR0_IPG_PODF(1) | \ - MX31_PDR0_MAX_PODF(3) | \ - MX31_PDR0_MCU_PODF(0), \ - MX31_CCM_BASE_ADDR + MX31_CCM_PDR0); - - writel(IMX_PLL_PD(0) | IMX_PLL_MFD(0x33) | - IMX_PLL_MFI(0xa) | IMX_PLL_MFN(0x0C), - MX31_CCM_BASE_ADDR + MX31_CCM_MPCTL); - writel(IMX_PLL_PD(1) | IMX_PLL_MFD(0x43) | IMX_PLL_MFI(12) | - IMX_PLL_MFN(1), MX31_CCM_BASE_ADDR + - MX31_CCM_SPCTL); - - /* - * Configure IOMUXC - * Clears 0x43fa_c26c - 0x43fa_c2dc with 0, - * except 0x43fa_c278 (untouched), 0x43fa_c27c (set to 0x1000) - * and 0x43fa_c280 (untouched) - * (behaviour copied by sha, source unknown) - */ - writel(0, 0x43fac26c); /* SDCLK */ - writel(0, 0x43fac270); /* CAS */ - writel(0, 0x43fac274); /* RAS */ - - writel(0x1000, 0x43fac27c); /* CSD0 */ - - /* DQM3, DQM2, DQM1, DQM0, SD31-SD0, A25-A0, MA10 */ - for (r = 0x43fac284; r <= 0x43fac2dc; r += 4) - writel(0, r); - - /* Skip SDRAM initialization if we run from RAM */ - r = get_pc(); - if (r > 0x80000000 && r < 0xa0000000) - imx31_barebox_entry(NULL); - - writel(0x00000004, MX31_ESDCTL_BASE_ADDR + IMX_ESDMISC); - writel(0x00695727, MX31_ESDCTL_BASE_ADDR + IMX_ESDCFG0); - writel(0x92100000, MX31_ESDCTL_BASE_ADDR + IMX_ESDCTL0); - writel(0x12344321, MX31_CSD0_BASE_ADDR + 0xf00); - writel(0xa2100000, MX31_ESDCTL_BASE_ADDR + IMX_ESDCTL0); - writel(0x12344321, MX31_CSD0_BASE_ADDR); - writel(0x12344321, MX31_CSD0_BASE_ADDR); - writel(0xb2100000, MX31_ESDCTL_BASE_ADDR + IMX_ESDCTL0); - writeb(0xda, MX31_CSD0_BASE_ADDR + 0x33); - writeb(0xff, MX31_CSD0_BASE_ADDR + 0x01000000); - writel(0x82226080, MX31_ESDCTL_BASE_ADDR + IMX_ESDCTL0); - writel(0xDEADBEEF, MX31_CSD0_BASE_ADDR); - writel(0x0000000c, MX31_ESDCTL_BASE_ADDR + IMX_ESDMISC); - - imx31_barebox_entry(NULL); - -} - -void __bare_init __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2) -{ - arm_cpu_lowlevel_init(); - - /* Temporary stack location in internal SRAM */ - arm_setup_stack(MX31_IRAM_BASE_ADDR + MX31_IRAM_SIZE); - - mx31moboard_startup(); -} diff --git a/arch/arm/boards/mx31moboard/mx31moboard.c b/arch/arm/boards/mx31moboard/mx31moboard.c deleted file mode 100644 index b53d70ab45..0000000000 --- a/arch/arm/boards/mx31moboard/mx31moboard.c +++ /dev/null @@ -1,246 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -// SPDX-FileCopyrightText: 2007 Sascha Hauer <[email protected]>, Pengutronix -// SPDX-FileCopyrightText: 2014 Philippe Rétornaz <[email protected]>, EPFL - -/* - * Board support for EPFL's, i.MX31 based CPU card - * - * Based on: - * Board support for Phytec's, i.MX31 based CPU card, called: PCM037 - */ - -#include <common.h> -#include <init.h> -#include <driver.h> -#include <fs.h> -#include <gpio.h> -#include <led.h> -#include <environment.h> -#include <usb/ulpi.h> -#include <mach/imx31-regs.h> -#include <mach/iomux-mx31.h> -#include <asm/armlinux.h> -#include <asm/sections.h> -#include <mach/weim.h> -#include <io.h> -#include <asm/mmu.h> -#include <partition.h> -#include <generated/mach-types.h> -#include <asm/barebox-arm.h> -#include <mach/devices-imx31.h> - -#define USBH2_EN_B IOMUX_TO_GPIO(MX31_PIN_SCK6) -#define USB_RESET_B IOMUX_TO_GPIO(MX31_PIN_GPIO1_0) - -static void mx31moboard_usb_init(void) -{ - u32 tmp; - - if (!IS_ENABLED(CONFIG_USB)) - return; - - /* enable clock */ - tmp = readl(0x53f80000); - tmp |= (1 << 9); - writel(tmp, 0x53f80000); - - /* Host 2 */ - tmp = readl(MX31_IOMUXC_GPR); - tmp |= 1 << 11; /* IOMUX GPR: enable USBH2 signals */ - writel(tmp, MX31_IOMUXC_GPR); - - imx_iomux_mode(IOMUX_MODE(MX31_PIN_SCK6, IOMUX_CONFIG_GPIO)); - imx_iomux_mode(IOMUX_MODE(MX31_PIN_GPIO1_0, IOMUX_CONFIG_GPIO)); - imx_iomux_mode(IOMUX_MODE(MX31_PIN_USBH2_CLK, IOMUX_CONFIG_FUNC)); - imx_iomux_mode(IOMUX_MODE(MX31_PIN_USBH2_DIR, IOMUX_CONFIG_FUNC)); - imx_iomux_mode(IOMUX_MODE(MX31_PIN_USBH2_NXT, IOMUX_CONFIG_FUNC)); - imx_iomux_mode(IOMUX_MODE(MX31_PIN_USBH2_STP, IOMUX_CONFIG_FUNC)); - imx_iomux_mode(IOMUX_MODE(MX31_PIN_USBH2_DATA0, IOMUX_CONFIG_FUNC)); - imx_iomux_mode(IOMUX_MODE(MX31_PIN_USBH2_DATA1, IOMUX_CONFIG_FUNC)); - imx_iomux_mode(IOMUX_MODE(MX31_PIN_STXD3, IOMUX_CONFIG_FUNC)); - imx_iomux_mode(IOMUX_MODE(MX31_PIN_SRXD3, IOMUX_CONFIG_FUNC)); - imx_iomux_mode(IOMUX_MODE(MX31_PIN_SCK3, IOMUX_CONFIG_FUNC)); - imx_iomux_mode(IOMUX_MODE(MX31_PIN_SFS3, IOMUX_CONFIG_FUNC)); - imx_iomux_mode(IOMUX_MODE(MX31_PIN_STXD6, IOMUX_CONFIG_FUNC)); - imx_iomux_mode(IOMUX_MODE(MX31_PIN_SRXD6, IOMUX_CONFIG_FUNC)); - -#define H2_PAD_CFG (PAD_CTL_DRV_MAX | PAD_CTL_SRE_FAST | PAD_CTL_HYS_CMOS \ - | PAD_CTL_ODE_CMOS) - imx_iomux_set_pad(MX31_PIN_USBH2_CLK, H2_PAD_CFG | PAD_CTL_100K_PU); - imx_iomux_set_pad(MX31_PIN_USBH2_DIR, H2_PAD_CFG | PAD_CTL_100K_PU); - imx_iomux_set_pad(MX31_PIN_USBH2_NXT, H2_PAD_CFG | PAD_CTL_100K_PU); - imx_iomux_set_pad(MX31_PIN_USBH2_STP, H2_PAD_CFG | PAD_CTL_100K_PU); - imx_iomux_set_pad(MX31_PIN_USBH2_DATA0, H2_PAD_CFG); /* USBH2_DATA0 */ - imx_iomux_set_pad(MX31_PIN_USBH2_DATA1, H2_PAD_CFG); /* USBH2_DATA1 */ - imx_iomux_set_pad(MX31_PIN_SRXD6, H2_PAD_CFG); /* USBH2_DATA2 */ - imx_iomux_set_pad(MX31_PIN_STXD6, H2_PAD_CFG); /* USBH2_DATA3 */ - imx_iomux_set_pad(MX31_PIN_SFS3, H2_PAD_CFG); /* USBH2_DATA4 */ - imx_iomux_set_pad(MX31_PIN_SCK3, H2_PAD_CFG); /* USBH2_DATA5 */ - imx_iomux_set_pad(MX31_PIN_SRXD3, H2_PAD_CFG); /* USBH2_DATA6 */ - imx_iomux_set_pad(MX31_PIN_STXD3, H2_PAD_CFG); /* USBH2_DATA7 */ - - - gpio_request(USB_RESET_B, "usb-reset"); - gpio_direction_output(USB_RESET_B, 0); - mdelay(5); - gpio_set_value(USB_RESET_B, 1); - mdelay(10); - - gpio_request(USBH2_EN_B, "usbh2-en"); - gpio_direction_output(USBH2_EN_B, 0); - udelay(900); - gpio_set_value(USBH2_EN_B, 1); - udelay(200); - - tmp = readl(MX31_USB_OTG_BASE_ADDR + 0x600); - tmp &= ~((3 << 21) | 1); - tmp |= (1 << 5) | (1 << 16) | (1 << 19) | (1 << 20); - writel(tmp, MX31_USB_OTG_BASE_ADDR + 0x600); - - tmp = readl(MX31_USB_OTG_BASE_ADDR + 0x584); - tmp &= ~(3 << 30); - tmp |= 2 << 30; - writel(tmp, MX31_USB_OTG_BASE_ADDR + 0x584); - - gpio_set_value(USBH2_EN_B, 0); - - mdelay(50); - - ulpi_setup((void *)(MX31_USB_OTG_BASE_ADDR + 0x570), 1); - - /* Set to Host mode */ - tmp = readl(MX31_USB_OTG_BASE_ADDR + 0x1a8); - writel(tmp | 0x3, MX31_USB_OTG_BASE_ADDR + 0x1a8); - -} - -static struct gpio_led mx31moboard_leds[] = { - { - .led = { - .name = "coreboard-led-0:red:running" - }, - .gpio = IOMUX_TO_GPIO(MX31_PIN_SVEN0), - }, { - .led = { - .name = "coreboard-led-1:red", - }, - .gpio = IOMUX_TO_GPIO(MX31_PIN_STX0), - }, { - .led = { - .name = "coreboard-led-2:red", - }, - .gpio = IOMUX_TO_GPIO(MX31_PIN_SRX0), - }, { - .led = { - .name = "coreboard-led-3:red", - }, - .gpio = IOMUX_TO_GPIO(MX31_PIN_SIMPD0), - }, -}; - -static void mx31moboard_add_leds(void) -{ - int i; - - if (!IS_ENABLED(CONFIG_LED_GPIO)) - return; - - for (i = 0; i < ARRAY_SIZE(mx31moboard_leds); i++) { - led_gpio_register(&mx31moboard_leds[i]); - led_set(&mx31moboard_leds[i].led, 0); - } - - led_set_trigger(LED_TRIGGER_HEARTBEAT, &mx31moboard_leds[0].led); -} - -static int mx31moboard_mmu_init(void) -{ - l2x0_init((void __iomem *)0x30000000, 0x00030024, 0x00000000); - - return 0; -} -postmmu_initcall(mx31moboard_mmu_init); - -static const struct devfs_partition mx31moboard_nor0_partitions[] = { - { - .offset = 0, - .size = SZ_512K, - .flags = DEVFS_PARTITION_FIXED, - .name = "self0", - }, { - .offset = DEVFS_PARTITION_APPEND, - .size = SZ_256K, - .name = "env0", - }, { - /* Sentinel */ - } -}; - -static int mx31moboard_devices_init(void) -{ - /* CS0: Nor Flash */ - imx31_setup_weimcs(0, 0x0000CC03, 0xa0330D01, 0x00220800); - - /* - * Up to 32MiB NOR type flash, connected to - * CS line 0, data width is 16 bit - */ - add_cfi_flash_device(DEVICE_ID_DYNAMIC, MX31_CS0_BASE_ADDR, SZ_32M, 0); - - imx31_add_mmc0(NULL); - - /* - * Create partitions that should be - * not touched by any regular user - */ - devfs_create_partitions("nor0", mx31moboard_nor0_partitions); - protect_file("/dev/env0", 1); - - mx31moboard_usb_init(); - add_generic_usb_ehci_device(DEVICE_ID_DYNAMIC, - MX31_USB_HS2_BASE_ADDR, NULL); - - mx31moboard_add_leds(); - - armlinux_set_architecture(MACH_TYPE_MX31MOBOARD); - - return 0; -} - -device_initcall(mx31moboard_devices_init); - -static unsigned int mx31moboard_iomux[] = { - /* UART1 */ - MX31_PIN_RXD1__RXD1, - MX31_PIN_TXD1__TXD1, - MX31_PIN_CTS1__GPIO2_7, - /* SDHC1 */ - MX31_PIN_SD1_DATA3__SD1_DATA3, - MX31_PIN_SD1_DATA2__SD1_DATA2, - MX31_PIN_SD1_DATA1__SD1_DATA1, - MX31_PIN_SD1_DATA0__SD1_DATA0, - MX31_PIN_SD1_CLK__SD1_CLK, - MX31_PIN_SD1_CMD__SD1_CMD, - MX31_PIN_ATA_CS0__GPIO3_26, MX31_PIN_ATA_CS1__GPIO3_27, - /* LEDS */ - MX31_PIN_SVEN0__GPIO2_0, MX31_PIN_STX0__GPIO2_1, - MX31_PIN_SRX0__GPIO2_2, MX31_PIN_SIMPD0__GPIO2_3, -}; - -static int imx31_console_init(void) -{ - imx_iomux_setup_multiple_pins(mx31moboard_iomux, - ARRAY_SIZE(mx31moboard_iomux)); - - gpio_request(IOMUX_TO_GPIO(MX31_PIN_CTS1), "uart0-cts-hack"); - gpio_direction_output(IOMUX_TO_GPIO(MX31_PIN_CTS1), 0); - - barebox_set_model("EPFL mx31moboard"); - barebox_set_hostname("mx31moboard"); - - imx31_add_uart0(); - - return 0; -} - -console_initcall(imx31_console_init); diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 0824a46d79..5f5b762ce5 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -14,7 +14,6 @@ config ARCH_TEXT_BASE default 0xa7f00000 if MACH_PCA100 default 0xa0000000 if MACH_PCM038 default 0x87f00000 if MACH_PCM037 - default 0x87f00000 if MACH_MX31MOBOARD default 0x87f00000 if MACH_PCM043 default 0xa7e00000 if MACH_NESO default 0x97f00000 if MACH_FREESCALE_MX51_PDK @@ -680,15 +679,6 @@ config MACH_PCM037 Say Y here if you are using Phytec's phyCORE-i.MX31 (pcm037) equipped with a Freescale i.MX31 Processor -config MACH_MX31MOBOARD - bool "mx31moboard-i.MX31" - select ARCH_IMX31 - select USB_ULPI if USB - select ARCH_HAS_L2X0 - help - Say Y here if you are using EPFL mx31moboard board equipped - with a Freescale i.MX31 Processor - # ---------------------------------------------------------- comment "i.MX35 Boards" -- 2.29.2 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
