diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2021-05-17 16:23:50 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-05-17 16:23:50 +0200 |
commit | ca7163dc46ad767f6f33832bc416943f4deba416 (patch) | |
tree | ec36c89a7eed66d9c9ad321bad02e92666bf5d39 /arch/arm | |
parent | 0352849942a048b18f01405fc742005e428c043d (diff) | |
parent | 24ee98513ff80acea199990ebf0b765869234945 (diff) | |
download | barebox-ca7163dc46ad767f6f33832bc416943f4deba416.tar.gz barebox-ca7163dc46ad767f6f33832bc416943f4deba416.tar.xz |
Merge branch 'for-next/imx'
Diffstat (limited to 'arch/arm')
23 files changed, 7 insertions, 806 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index a46d9d6bde..f4b0e8d6b6 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -243,7 +243,6 @@ barebox.imximg: $(KBUILD_BINARY) FORCE boarddir = $(srctree)/arch/arm/boards imxcfg-$(CONFIG_MACH_FREESCALE_MX53_SMD) += $(boarddir)/freescale-mx53-smd/flash-header.imxcfg -imxcfg-$(CONFIG_MACH_TX51) += $(boarddir)/karo-tx51/flash-header-karo-tx51.imxcfg imxcfg-$(CONFIG_MACH_EUKREA_CPUIMX51SD) += $(boarddir)/eukrea_cpuimx51/flash-header.imxcfg imxcfg-$(CONFIG_MACH_FREESCALE_MX25_3STACK) += $(boarddir)/freescale-mx25-3ds/flash-header.imxcfg imxcfg-$(CONFIG_MACH_FREESCALE_MX35_3STACK) += $(boarddir)/freescale-mx35-3ds/flash-header.imxcfg diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile index 1441264dfa..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/ @@ -149,7 +148,6 @@ obj-$(CONFIG_MACH_TQMA6X) += tqma6x/ obj-$(CONFIG_MACH_TURRIS_OMNIA) += turris-omnia/ obj-$(CONFIG_MACH_TX25) += karo-tx25/ obj-$(CONFIG_MACH_TX28) += karo-tx28/ -obj-$(CONFIG_MACH_TX51) += karo-tx51/ obj-$(CONFIG_MACH_TX53) += karo-tx53/ obj-$(CONFIG_MACH_TX6X) += karo-tx6x/ obj-$(CONFIG_MACH_UDOO) += udoo/ diff --git a/arch/arm/boards/delphi-poc20/env/boot/mmc b/arch/arm/boards/delphi-poc20/env/boot/mmc deleted file mode 100644 index d5e202f395..0000000000 --- a/arch/arm/boards/delphi-poc20/env/boot/mmc +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -global.bootm.image="/mnt/mmc/zImage" -global.bootm.oftree="/mnt/mmc/oftree" -global.linux.bootargs.dyn.root="root=mmcblk0p2 rootfstype=ext3 rootwait" diff --git a/arch/arm/boards/karo-tx51/Makefile b/arch/arm/boards/karo-tx51/Makefile deleted file mode 100644 index 5afc8e23e0..0000000000 --- a/arch/arm/boards/karo-tx51/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -obj-y += tx51.o -lwl-y += lowlevel.o diff --git a/arch/arm/boards/karo-tx51/env/config b/arch/arm/boards/karo-tx51/env/config deleted file mode 100644 index 755eaec2c1..0000000000 --- a/arch/arm/boards/karo-tx51/env/config +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -machine=tx51 - -# use 'dhcp' to do dhcp in barebox and in kernel -# use 'none' if you want to skip kernel ip autoconfiguration -ip=dhcp - - -# or set your networking parameters here -#eth0.ipaddr=a.b.c.d -#eth0.ethaddr=de:ad:be:ef:00:00 -#eth0.netmask=a.b.c.d -#eth0.serverip=a.b.c.d -#eth0.gateway=a.b.c.d - -# can be either 'nfs', 'tftp', 'nor' or 'nand' -kernel_loc=tftp -# can be either 'net', 'nor', 'nand' or 'initrd' -rootfs_loc=net - -# can be either 'jffs2' or 'ubifs' -rootfs_type=ubifs -rootfsimage=root-$machine.$rootfs_type - -kernelimage=zImage_$machine -#kernelimage=uImage-$machine -#kernelimage=Image-$machine -#kernelimage=Image-$machine.lzo -kernel_part=nand0.kernel - -#nfsroot="$serverip:/srv/root" - -autoboot_timeout=3 - -bootargs="console=ttymxc0,115200" - -nand_device=mxc_nand -nand_parts="256k(barebox)ro,256k(bareboxenv),4M@0xc00000(kernel),64M(rootfs),-(rootfs_data)" - -# set a fancy prompt (if support is compiled in) -PS1="\e[1;32mbarebox@\e[1;31mtx51:\w\e[0m " diff --git a/arch/arm/boards/karo-tx51/flash-header-karo-tx51.imxcfg b/arch/arm/boards/karo-tx51/flash-header-karo-tx51.imxcfg deleted file mode 100644 index 4aaa75a0ea..0000000000 --- a/arch/arm/boards/karo-tx51/flash-header-karo-tx51.imxcfg +++ /dev/null @@ -1,13 +0,0 @@ -soc imx51 -loadaddr 0x90000000 -ivtofs 0x400 -wm 32 0x83fd9000 0x80000000 -wm 32 0x83fd9014 0x04008008 -wm 32 0x83fd9014 0x00008010 -wm 32 0x83fd9014 0x00008010 -wm 32 0x83fd9014 0x00338018 -wm 32 0x83fd9000 0xb2220000 -wm 32 0x83fd9004 0xb08564a9 -wm 32 0x83fd9034 0x20020000 -wm 32 0x83fd9010 0x000a0080 -wm 32 0x83fd9014 0x00000000 diff --git a/arch/arm/boards/karo-tx51/lowlevel.c b/arch/arm/boards/karo-tx51/lowlevel.c deleted file mode 100644 index 6762fdad4b..0000000000 --- a/arch/arm/boards/karo-tx51/lowlevel.c +++ /dev/null @@ -1,11 +0,0 @@ -#include <common.h> -#include <mach/esdctl.h> -#include <mach/generic.h> -#include <asm/barebox-arm-head.h> - -void __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2) -{ - imx5_cpu_lowlevel_init(); - arm_setup_stack(0x20000000); - imx51_barebox_entry(NULL); -} diff --git a/arch/arm/boards/karo-tx51/tx51.c b/arch/arm/boards/karo-tx51/tx51.c deleted file mode 100644 index 23088e62f2..0000000000 --- a/arch/arm/boards/karo-tx51/tx51.c +++ /dev/null @@ -1,268 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -// SPDX-FileCopyrightText: 2007 Sascha Hauer, Pengutronix -// SPDX-FileCopyrightText: 2012 Christian Kapeller <christian.kapeller@cmotion.eu> - -#include <common.h> -#include <init.h> -#include <environment.h> -#include <mach/imx51-regs.h> -#include <platform_data/eth-fec.h> -#include <gpio.h> -#include <asm/armlinux.h> -#include <generated/mach-types.h> -#include <partition.h> -#include <fs.h> -#include <fcntl.h> -#include <nand.h> -#include <spi/spi.h> -#include <io.h> -#include <asm/mmu.h> -#include <mach/imx5.h> -#include <mach/imx-nand.h> -#include <mach/spi.h> -#include <mach/generic.h> -#include <mach/iomux-mx51.h> -#include <mach/devices-imx51.h> -#include <mach/iim.h> - - -#define STK5_MX51_PAD_DISPB2_SER_RS__GPIO3_8 \ - IOMUX_PAD(0x6C8, 0x2C8, 4, 0x994, 1, PAD_CTL_PKE | PAD_CTL_PUE) - -#define STK5_MX51_PAD_DISPB2_SER_DIO__GPIO3_6 \ - IOMUX_PAD(0x6c0, 0x2c0, 4, 0x098c, 1, 0) - -static struct fec_platform_data fec_info = { - .xcv_type = PHY_INTERFACE_MODE_MII, -}; - -struct imx_nand_platform_data nand_info = { - .width = 1, - .hw_ecc = 1, - .flash_bbt = 1, -}; - -struct gpio_led tx51_leds[] = { - { - .led = { .name = "GPIO-LED", }, - .gpio = IMX_GPIO_NR(4,10), - .active_low = 0, - }, -}; - -static iomux_v3_cfg_t tx51_pads[] = { - /*UART1*/ - MX51_PAD_UART1_RXD__UART1_RXD, - MX51_PAD_UART1_TXD__UART1_TXD, - MX51_PAD_UART1_CTS__UART1_CTS, - MX51_PAD_UART1_RTS__UART1_RTS, - - /* (e)CSPI */ - MX51_PAD_CSPI1_MOSI__ECSPI1_MOSI, - MX51_PAD_CSPI1_MISO__ECSPI1_MISO, - MX51_PAD_CSPI1_SCLK__ECSPI1_SCLK, - MX51_PAD_CSPI1_RDY__ECSPI1_RDY, - - /* (e)CSPI chip select lines */ - MX51_PAD_CSPI1_SS0__GPIO4_24, - MX51_PAD_CSPI1_SS1__GPIO4_25, - -#ifdef CONFIG_MCI_IMX_ESDHC - /* eSDHC 1 */ - MX51_PAD_SD1_CMD__SD1_CMD, - MX51_PAD_SD1_CLK__SD1_CLK, - MX51_PAD_SD1_DATA0__SD1_DATA0, - MX51_PAD_SD1_DATA1__SD1_DATA1, - MX51_PAD_SD1_DATA2__SD1_DATA2, - MX51_PAD_SD1_DATA3__SD1_DATA3, - - /* SD1 card detect */ - STK5_MX51_PAD_DISPB2_SER_RS__GPIO3_8, - - /* eSDHC 2 */ - MX51_PAD_SD2_CMD__SD2_CMD, - MX51_PAD_SD2_CLK__SD2_CLK, - MX51_PAD_SD2_DATA0__SD2_DATA0, - MX51_PAD_SD2_DATA1__SD2_DATA1, - MX51_PAD_SD2_DATA2__SD2_DATA2, - MX51_PAD_SD2_DATA3__SD2_DATA3, - - /* SD2 card detect */ - STK5_MX51_PAD_DISPB2_SER_DIO__GPIO3_6, -#endif - - /* SW controlled LED on STK5 baseboard */ - MX51_PAD_CSI2_D13__GPIO4_10, - - /* unuseable pads configured as GPIO */ - MX51_PAD_GPIO1_1__GPIO1_1, - MX51_PAD_GPIO1_0__GPIO1_0, -}; - -static int spi_0_cs[] = { - IMX_GPIO_NR(4, 24), - IMX_GPIO_NR(4, 25), -}; - -static struct spi_imx_master tx51_spi_0_data = { - .chipselect = spi_0_cs, - .num_chipselect = ARRAY_SIZE(spi_0_cs), -}; - -static const struct spi_board_info mx51_tx51_spi_board_info[] = {}; - -static struct tx51_fec_gpio_setup { - iomux_v3_cfg_t pad; - unsigned group:4, - shift:5, - level:1; -} tx51_fec_gpios[] = { - { MX51_PAD_EIM_A20__GPIO2_14, 2, 14, 0 }, /* PHY reset */ - { MX51_PAD_GPIO1_3__GPIO1_3, 1, 3, 0 }, /* PHY power enable */ - { MX51_PAD_NANDF_CS3__GPIO3_19, 3, 19, 0 }, /* MDC */ - { MX51_PAD_EIM_EB2__GPIO2_22, 2, 22, 0 }, /* MDIO */ - { MX51_PAD_NANDF_RB3__GPIO3_11, 3, 11, 0 }, /* RX_CLK */ - { MX51_PAD_NANDF_D11__GPIO3_29, 3, 29, 0 }, /* RX_DV */ - { MX51_PAD_NANDF_D9__GPIO3_31, 3, 31, 1 }, /* RXD0/Mode0 */ - { MX51_PAD_EIM_EB3__GPIO2_23, 2, 23, 1 }, /* RXD1/Mode1 */ - { MX51_PAD_EIM_CS2__GPIO2_27, 2, 27, 1 }, /* RXD2/Mode2 */ - { MX51_PAD_EIM_CS3__GPIO2_28, 2, 28, 1 }, /* RXD3/nINTSEL */ - { MX51_PAD_EIM_CS4__GPIO2_29, 2, 29, 0 }, /* RX_ER/RXD4 */ - { MX51_PAD_NANDF_RDY_INT__GPIO3_24, 3, 24, 0 }, /* TX_CLK */ - { MX51_PAD_NANDF_CS7__GPIO3_23, 3, 23, 0 }, /* TX_EN */ - { MX51_PAD_NANDF_D8__GPIO4_0, 4, 0, 0 }, /* TXD0 */ - { MX51_PAD_NANDF_CS4__GPIO3_20, 3, 20, 0 }, /* TXD1 */ - { MX51_PAD_NANDF_CS5__GPIO3_21, 3, 21, 0 }, /* TXD2 */ - { MX51_PAD_NANDF_CS6__GPIO3_22, 3, 22, 0 }, /* TXD3 */ - { MX51_PAD_NANDF_RB2__GPIO3_10, 3, 10, 0 }, /* COL/RMII/CRSDV */ - { MX51_PAD_EIM_CS5__GPIO2_30, 2, 30, 0 }, /* CRS */ - { MX51_PAD_NANDF_CS2__GPIO3_18, 3, 18, 0 }, /* nINT/TX_ER/TXD4 */ -}; - -static iomux_v3_cfg_t tx51_fec_pads[] = { - MX51_PAD_NANDF_CS2__FEC_TX_ER, - MX51_PAD_NANDF_RDY_INT__FEC_TX_CLK, - MX51_PAD_NANDF_CS3__FEC_MDC, - MX51_PAD_NANDF_CS4__FEC_TDATA1, - MX51_PAD_NANDF_CS5__FEC_TDATA2, - MX51_PAD_NANDF_CS6__FEC_TDATA3, - MX51_PAD_NANDF_CS7__FEC_TX_EN, - MX51_PAD_NANDF_RB2__FEC_COL, - MX51_PAD_NANDF_RB3__FEC_RX_CLK, - MX51_PAD_NANDF_D8__FEC_TDATA0, - MX51_PAD_NANDF_D9__FEC_RDATA0, - MX51_PAD_NANDF_D11__FEC_RX_DV, - MX51_PAD_EIM_EB2__FEC_MDIO, - MX51_PAD_EIM_EB3__FEC_RDATA1, - MX51_PAD_EIM_CS2__FEC_RDATA2, - MX51_PAD_EIM_CS3__FEC_RDATA3, - MX51_PAD_EIM_CS4__FEC_RX_ER, - MX51_PAD_EIM_CS5__FEC_CRS, -}; - -#define TX51_FEC_PHY_RST IMX_GPIO_NR(2, 14) -#define TX51_FEC_PHY_PWR IMX_GPIO_NR(1, 3) -#define TX51_FEC_PHY_INT IMX_GPIO_NR(3, 18) - -static inline void tx51_fec_init(void) -{ - int i; - - /* Configure LAN8700 pads as GPIO and set up - * necessary strap options for PHY - */ - for (i = 0; i < ARRAY_SIZE(tx51_fec_gpios); i++) { - struct tx51_fec_gpio_setup *gs = &tx51_fec_gpios[i]; - - gpio_direction_output(IMX_GPIO_NR(gs->group, gs->shift ), gs->level); - mxc_iomux_v3_setup_pad(gs->pad); - } - - /* - *Turn on phy power, leave in reset state - */ - gpio_set_value(TX51_FEC_PHY_PWR, 1); - - /* - * Wait some time to let the phy activate the internal regulator - */ - mdelay(10); - - /* - * Deassert reset, phy latches the rest of bootstrap pins - */ - gpio_set_value(TX51_FEC_PHY_RST, 1); - - /* LAN7800 has an internal Power On Reset (POR) signal (OR'ed with - * the external RESET signal) which is deactivated 21ms after - * power on and latches the strap options. - * Delay for 22ms to ensure, that the internal POR is inactive - * before reconfiguring the strap pins. - */ - mdelay(22); - - /* - * The phy is ready, now configure imx51 pads for fec operation - */ - mxc_iomux_v3_setup_multiple_pads(tx51_fec_pads, - ARRAY_SIZE(tx51_fec_pads)); -} - -static void tx51_leds_init(void) -{ - int i; - - for (i = 0 ; i < ARRAY_SIZE(tx51_leds) ; i++) - led_gpio_register(&tx51_leds[i]); -} - -static int tx51_devices_init(void) -{ -#ifdef CONFIG_MCI_IMX_ESDHC - imx51_add_mmc0(NULL); - imx51_add_mmc1(NULL); -#endif - - imx51_add_nand(&nand_info); - - spi_register_board_info(mx51_tx51_spi_board_info, - ARRAY_SIZE(mx51_tx51_spi_board_info)); - imx51_add_spi0(&tx51_spi_0_data); - - imx51_iim_register_fec_ethaddr(); - tx51_fec_init(); - imx51_add_fec(&fec_info); - - tx51_leds_init(); - - //Linux Parameters - armlinux_set_architecture(MACH_TYPE_TX51); - - return 0; -} -device_initcall(tx51_devices_init); - -static int tx51_part_init(void) -{ - devfs_add_partition("nand0", 0x00000, 0x40000, DEVFS_PARTITION_FIXED, "self_raw"); - dev_add_bb_dev("self_raw", "self0"); - devfs_add_partition("nand0", 0x40000, 0x80000, DEVFS_PARTITION_FIXED, "env_raw"); - dev_add_bb_dev("env_raw", "env0"); - - return 0; -} -late_initcall(tx51_part_init); - -static int tx51_console_init(void) -{ - imx51_init_lowlevel(800); - mxc_iomux_v3_setup_multiple_pads(tx51_pads, ARRAY_SIZE(tx51_pads)); - - barebox_set_model("Ka-Ro TX51"); - barebox_set_hostname("tx51"); - - imx51_add_uart0(); - - return 0; -} -console_initcall(tx51_console_init); diff --git a/arch/arm/boards/mnt-reform/board.c b/arch/arm/boards/mnt-reform/board.c index e2d628586a..feb874c0a0 100644 --- a/arch/arm/boards/mnt-reform/board.c +++ b/arch/arm/boards/mnt-reform/board.c @@ -28,7 +28,7 @@ static int mnt_reform_probe(struct device_d *dev) } static const struct of_device_id mnt_reform_of_match[] = { - { .compatible = "mnt,reform2"}, + { .compatible = "mntre,reform2"}, { /* sentinel */ }, }; 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 <jbe@pengutronix.de> - -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 <s.hauer@pengutronix.de>, Pengutronix -// SPDX-FileCopyrightText: 2014 Philippe Rétornaz <philippe.retornaz@epfl.ch>, 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 <s.hauer@pengutronix.de>, Pengutronix -// SPDX-FileCopyrightText: 2014 Philippe Rétornaz <philippe.retornaz@epfl.ch>, 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/boards/skov-imx6/env/init/automount b/arch/arm/boards/skov-imx6/env/init/automount deleted file mode 100644 index bc9ff48a0a..0000000000 --- a/arch/arm/boards/skov-imx6/env/init/automount +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "Automountpoints" - exit -fi - -# development support -mkdir -p /mnt/tftp -automount /mnt/tftp 'ifup eth0 && mount -t tftp $eth0.serverip /mnt/tftp' - -# regular SD card based boot procedure -mkdir -p /mnt/sd -automount -d /mnt/sd 'mmc2.probe=1 && mount -t ext4 /dev/mmc2.0 /mnt/sd' diff --git a/arch/arm/boards/skov-imx6/env/nv/boot.default b/arch/arm/boards/skov-imx6/env/nv/boot.default deleted file mode 100644 index fe1a363da1..0000000000 --- a/arch/arm/boards/skov-imx6/env/nv/boot.default +++ /dev/null @@ -1 +0,0 @@ -bootchooser diff --git a/arch/arm/configs/tx51stk5_defconfig b/arch/arm/configs/tx51stk5_defconfig deleted file mode 100644 index 47e848c466..0000000000 --- a/arch/arm/configs/tx51stk5_defconfig +++ /dev/null @@ -1,57 +0,0 @@ -CONFIG_ARCH_IMX=y -CONFIG_MACH_TX51=y -CONFIG_IMX_IIM=y -CONFIG_AEABI=y -CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_ARM_UNWIND=y -CONFIG_MMU=y -CONFIG_MALLOC_TLSF=y -CONFIG_KALLSYMS=y -CONFIG_GLOB=y -CONFIG_HUSH_FANCY_PROMPT=y -CONFIG_CMDLINE_EDITING=y -CONFIG_AUTO_COMPLETE=y -CONFIG_BOOTM_SHOW_TYPE=y -CONFIG_BOOTM_VERBOSE=y -CONFIG_BOOTM_INITRD=y -CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y -CONFIG_LONGHELP=y -CONFIG_CMD_IOMEM=y -CONFIG_CMD_MEMINFO=y -CONFIG_CMD_GO=y -CONFIG_CMD_RESET=y -CONFIG_CMD_UIMAGE=y -CONFIG_CMD_PARTITION=y -CONFIG_CMD_EXPORT=y -CONFIG_CMD_LOADENV=y -CONFIG_CMD_PRINTENV=y -CONFIG_CMD_MAGICVAR=y -CONFIG_CMD_MAGICVAR_HELP=y -CONFIG_CMD_SAVEENV=y -CONFIG_CMD_UNCOMPRESS=y -CONFIG_CMD_SLEEP=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_PING=y -CONFIG_CMD_TFTP=y -CONFIG_CMD_ECHO_E=y -CONFIG_CMD_EDIT=y -CONFIG_CMD_READLINE=y -CONFIG_CMD_TIMEOUT=y -CONFIG_CMD_FLASH=y -CONFIG_CMD_GPIO=y -CONFIG_CMD_LED=y -CONFIG_CMD_TIME=y -CONFIG_NET=y -CONFIG_DRIVER_NET_FEC_IMX=y -CONFIG_MTD=y -CONFIG_NAND=y -CONFIG_NAND_IMX=y -CONFIG_MCI=y -CONFIG_MCI_STARTUP=y -CONFIG_MCI_IMX_ESDHC=y -CONFIG_LED=y -CONFIG_LED_GPIO=y -CONFIG_FS_TFTP=y -CONFIG_FS_FAT=y -CONFIG_ZLIB=y -CONFIG_LZO_DECOMPRESS=y diff --git a/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi b/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi index 2fb920945f..2c333ce8fe 100644 --- a/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi +++ b/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi @@ -29,7 +29,7 @@ environment-spinor { compatible = "barebox,environment"; - device-path = &m25p80, "partname:nor.barebox-environment"; + device-path = &m25p80, "partname:barebox-environment"; status = "disabled"; }; }; @@ -86,22 +86,22 @@ #size-cells = <1>; partition@0 { - label = "nor.barebox"; + label = "barebox"; reg = <0x0 0x100000>; }; partition@100000 { - label = "nor.barebox-environment"; + label = "barebox-environment"; reg = <0x100000 0x20000>; }; partition@120000 { - label = "nor.oftree"; + label = "oftree"; reg = <0x120000 0x20000>; }; partition@140000 { - label = "nor.kernel"; + label = "kernel"; reg = <0x140000 0x0>; }; }; diff --git a/arch/arm/dts/imx8mq-mnt-reform2.dts b/arch/arm/dts/imx8mq-mnt-reform2.dts index 4e80e00dd1..5a65324b3c 100644 --- a/arch/arm/dts/imx8mq-mnt-reform2.dts +++ b/arch/arm/dts/imx8mq-mnt-reform2.dts @@ -12,7 +12,7 @@ / { model = "MNT Reform2"; - compatible = "mnt,reform2", "fsl,imx8mq"; + compatible = "mntre,reform2", "fsl,imx8mq"; chosen { stdout-path = &uart1; diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 38aee42bf2..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 @@ -24,7 +23,6 @@ config ARCH_TEXT_BASE default 0x87f00000 if MACH_GUF_CUPID default 0x93d00000 if MACH_TX25 default 0x7ff00000 if MACH_TQMA53 - default 0x97f00000 if MACH_TX51 default 0x4fc00000 if MACH_SABRELITE default 0x8fe00000 if MACH_TX53 default 0x97f00000 if MACH_EFIKA_MX_SMARTBOOK @@ -681,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" @@ -747,12 +736,6 @@ config MACH_EUKREA_CPUIMX51SD Say Y here if you are using Eukrea's CPUIMX51 equipped with a Freescale i.MX51 Processor -config MACH_TX51 - bool "Ka-Ro TX51" - select ARCH_IMX51 - help - Say Y here if you are using the Ka-Ro tx51 board - # ---------------------------------------------------------- comment "i.MX53 Boards" |