The SPI and NAND board variants never went into production.
Drop those board variants.
Signed-off-by: Bernhard Messerklinger <bernhard.messerklin...@br-automation.com>
---
arch/arm/dts/Makefile | 2 -
arch/arm/dts/am335x-brppt1-nand.dts | 374 ---------------------------
arch/arm/dts/am335x-brppt1-spi.dts | 377 ----------------------------
board/BuR/brppt1/board.c | 4 +-
board/BuR/brppt1/mux.c | 39 +--
configs/brppt1_nand_defconfig | 122 ---------
configs/brppt1_spi_defconfig | 130 ----------
include/configs/brppt1.h | 64 +----
8 files changed, 7 insertions(+), 1105 deletions(-)
delete mode 100644 arch/arm/dts/am335x-brppt1-nand.dts
delete mode 100644 arch/arm/dts/am335x-brppt1-spi.dts
delete mode 100644 configs/brppt1_nand_defconfig
delete mode 100644 configs/brppt1_spi_defconfig
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 7330121dba..5bff2e65b7 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -388,8 +388,6 @@ dtb-$(CONFIG_AM33XX) += \
am335x-boneblack-wireless.dtb \
am335x-boneblue.dtb \
am335x-brppt1-mmc.dtb \
- am335x-brppt1-nand.dtb \
- am335x-brppt1-spi.dtb \
am335x-brxre1.dtb \
am335x-brsmarc1.dtb \
am335x-draco.dtb \
diff --git a/arch/arm/dts/am335x-brppt1-nand.dts
b/arch/arm/dts/am335x-brppt1-nand.dts
deleted file mode 100644
index 67c609739f..0000000000
--- a/arch/arm/dts/am335x-brppt1-nand.dts
+++ /dev/null
@@ -1,374 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018 B&R Industrial Automation GmbH
- * http://www.br-automation.com
- *
- */
-/dts-v1/;
-
-#include "am33xx.dtsi"
-
-/ {
- model = "BRPPT1 (NAND) Panel";
- compatible = "ti,am33xx";
-
- fset: factory-settings {
- bl-version = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456890";
- version = <0x0100>;
- order-no = "6PPT30 (NAND)";
- hw-revision = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456890";
- serial-no = "0";
- device-id = <0x0>;
- parent-id = <0x0>;
- hw-variant = <0x1>;
- };
-
- aliases {
- ds1bkl0 = &pwmbacklight;
- ds1bkl1 = &tps_bl;
- ds1timing = &timing0;
- ds1ctrl = &lcdc;
- gpmc = &gpmc;
- mmc = &mmc2;
- fset = &fset;
- };
-
- chosen {
- bootargs = "console=ttyO0,115200 earlyprintk";
- stdout-path = &uart0;
- };
-
- memory {
- device_type = "memory";
- reg = <0x80000000 0x10000000>; /* 256 MB */
- };
-
- panel {
- status = "disabled";
-
- compatible = "ti,tilcdc,panel";
- enable-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
-
- backlight = <&pwmbacklight>;
- bkl-pwm = <&pwmbacklight>;
- bkl-tps = <&tps_bl>;
-
- panel-info {
- ac-bias = <255>;
- ac-bias-intrpt = <0>;
- dma-burst-sz = <16>;
- bpp = <32>;
- fdd = <0x80>;
- sync-edge = <0>;
- sync-ctrl = <1>;
- raster-order = <0>;
- fifo-th = <0>;
- };
-
- display-timings {
- native-mode = <&timing0>;
- timing0: lcd {
- clock-frequency = <32000000>;
- hactive = <800>;
- vactive = <480>;
- hfront-porch = <2>;
- hback-porch = <192>;
- hsync-len = <1>;
- vfront-porch = <20>;
- vback-porch = <2>;
- vsync-len = <1>;
- hsync-active = <1>;
- vsync-active = <1>;
- pupdelay = <10>;
- pondelay = <10>;
- };
- };
- };
-
- vmmcsd_fixed: fixedregulator@0 {
- compatible = "regulator-fixed";
- regulator-name = "vmmcsd_fixed";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- };
-
- pwm0: omap-pwm@timer5 {
- compatible = "ti,omap-dmtimer-pwm";
- ti,timers = <&timer5>;
- #pwm-cells = <3>;
- };
-
- pwm1: omap-pwm@timer6 {
- compatible = "ti,omap-dmtimer-pwm";
- ti,timers = <&timer6>;
- #pwm-cells = <3>;
- };
-
- beeper: pwm-beep {
- compatible = "pwm-beeper";
- pwms = <&pwm0 0 0 0>;
- };
-
- pwmbacklight: pwm-bkl {
- compatible = "pwm-backlight";
- pwms = <&pwm1 0 5000000 0>;
-
- default-brightness-level = <255>;
- brightness-levels = <0 16 32 64 128 170 202 234 255>;
-
- power-supply = <&vmmcsd_fixed>;
- enable-gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
- };
-};
-
-&uart0 { /* console uart */
- u-boot,dm-spl;
- status = "okay";
-};
-
-&uart1 {
- status = "okay";
-};
-
-&i2c0 {
- u-boot,dm-spl;
- status = "okay";
- clock-frequency = <400000>;
-
- tps: tps@24 { /* PMIC controller */
- u-boot,dm-spl;
- reg = <0x24>;
- compatible = "ti,tps65217";
-
- tps_bl: backlight {
- compatible = "ti,tps65217-bl";
- isel = <1>; /* 1 - ISET1, 2 ISET2 */
- fdim = <1000>; /* TPS65217_BL_FDIM_1kHZ */
- default-brightness = <50>;
- };
- };
-};
-
-&i2c2 {
- status = "okay";
- clock-frequency = <100000>;
-};
-
-&edma {
- status = "okay";
-};
-
-&cppi41dma {
- status = "okay";
-};
-
-&usb {
- status = "okay";
-};
-
-&usb_ctrl_mod {
- status = "okay";
-};
-
-&usb0_phy {
- status = "okay";
-};
-
-&usb1_phy {
- status = "okay";
-};
-
-&usb0 {
- status = "okay";
- dr_mode = "host";
-};
-
-&usb1 {
- status = "okay";
- dr_mode = "host";
-};
-
-&davinci_mdio {
- status = "okay";
-
- phy0: ethernet-phy@0 {
- reg = <1>;
- };
-
- phy1: ethernet-phy@1 {
- reg = <2>;
- };
-};
-
-&mac {
- dual_emac;
- status = "okay";
-};
-
-&cpsw_emac0 {
- phy-handle = <&phy0>;
- dual_emac_res_vlan = <1>;
- phy-mode = "mii";
-};
-
-&cpsw_emac1 {
- phy-handle = <&phy1>;
- dual_emac_res_vlan = <2>;
- phy-mode = "mii";
-};
-
-&mmc2 {
- vmmc-supply = <&vmmcsd_fixed>;
- bus-width = <0x4>;
- ti,non-removable;
- ti,needs-special-hs-handling;
- ti,vcc-aux-disable-is-sleep;
- status = "disabled";
-};
-
-&l4_per {
-
- segment@300000 {
-
- target-module@e000 {
- u-boot,dm-pre-reloc;
-
- lcdc: lcdc@0 {
- u-boot,dm-pre-reloc;
- status = "disabled";
- };
- };
- };
-};
-
-&elm {
- status = "okay";
-};
-
-&sham {
- status = "okay";
-};
-
-&aes {
- status = "okay";
-};
-
-&gpio0 {
- u-boot,dm-spl;
- ti,no-reset-on-init;
-};
-
-&gpio1 {
- u-boot,dm-spl;
- ti,no-reset-on-init;
-};
-
-&gpio2 {
- u-boot,dm-spl;
- ti,no-reset-on-init;
-};
-
-&gpio3 {
- u-boot,dm-spl;
- ti,no-reset-on-init;
-};
-
-&wdt2 {
- ti,no-reset-on-init;
- ti,no-idle-on-init;
-};
-
-&tscadc {
- status = "okay";
- tsc {
- ti,wires = <4>;
- ti,x-plate-resistance = <200>;
- ti,zx-cutoff-ratio = <40>;
- ti,min_deviation = <60>;
- ti,max_deviation = <600>;
- ti,coordinate-readouts = <5>;
- ti,wire-config = <0x00 0x11 0x22 0x33>;
-
- bnr-buttons {
- Home-Button {};
- };
- };
-
- adc {
- ti,adc-channels = <5 6 7>;
- };
-};
-
-&gpmc {
- u-boot,dm-spl;
- status = "okay";
- pinctrl-names = "default";
- ranges = <0 0 0x08000000 0x10000000>; /* CS0: NAND */
- nand@0,0 {
- compatible = "ti,omap2-nand";
- reg = <0 0 4>; /* CS0, offset 0, IO size 4 */
- interrupt-parent = <&gpmc>;
- rb-gpios = <&gpmc 1 GPIO_ACTIVE_HIGH>; /* gpmc_wait1 */
- ti,nand-ecc-opt = "bch8";
- ti,elm-id = <&elm>;
- nand-bus-width = <8>;
- gpmc,device-width = <1>;
- gpmc,sync-clk-ps = <0>;
- gpmc,cs-on-ns = <0>;
- gpmc,cs-rd-off-ns = <44>;
- gpmc,cs-wr-off-ns = <44>;
- gpmc,adv-on-ns = <6>;
- gpmc,adv-rd-off-ns = <34>;
- gpmc,adv-wr-off-ns = <44>;
- gpmc,we-on-ns = <0>;
- gpmc,we-off-ns = <40>;
- gpmc,oe-on-ns = <0>;
- gpmc,oe-off-ns = <54>;
- gpmc,access-ns = <64>;
- gpmc,rd-cycle-ns = <82>;
- gpmc,wr-cycle-ns = <82>;
- gpmc,wait-on-read = "true";
- gpmc,wait-on-write = "true";
- gpmc,bus-turnaround-ns = <0>;
- gpmc,cycle2cycle-delay-ns = <0>;
- gpmc,clk-activation-ns = <0>;
- gpmc,wait-monitoring-ns = <0>;
- gpmc,wr-access-ns = <40>;
- gpmc,wr-data-mux-bus-ns = <0>;
- gpmc,wait-pin = <1>;
- #address-cells = <1>;
- #size-cells = <1>;
- partition@0 {
- label = "NAND.MLO";
- reg = <0x00000000 0x000020000>;
- };
- partition@1 {
- label = "NAND.cfgscr";
- reg = <0x00020000 0x00020000>;
- };
- partition@2 {
- label = "NAND.dtb";
- reg = <0x00040000 0x00020000>;
- };
- partition@3 {
- label = "NAND.u-boot-env";
- reg = <0x00060000 0x00020000>;
- };
- partition@4 {
- label = "NAND.u-boot";
- reg = <0x00080000 0x00080000>;
- };
- partition@5 {
- label = "NAND.kernel";
- reg = <0x00100000 0x00400000>;
- };
- partition@6 {
- label = "NAND.rootfs";
- reg = <0x00500000 0x08000000>;
- };
- partition@7 {
- label = "NAND.user";
- reg = <0x08500000 0x17b00000>;
- };
- };
-};
diff --git a/arch/arm/dts/am335x-brppt1-spi.dts
b/arch/arm/dts/am335x-brppt1-spi.dts
deleted file mode 100644
index ce3dce204d..0000000000
--- a/arch/arm/dts/am335x-brppt1-spi.dts
+++ /dev/null
@@ -1,377 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018 B&R Industrial Automation GmbH
- * http://www.br-automation.com
- *
- */
-/dts-v1/;
-
-#include "am33xx.dtsi"
-
-/ {
- model = "BRPPT1 (MMC) Panel";
- compatible = "ti,am33xx";
-
- fset: factory-settings {
- bl-version = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456890";
- version = <0x0100>;
- order-no = "6PPT30 (SPI)";
- hw-revision = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456890";
- serial-no = "0";
- device-id = <0x0>;
- parent-id = <0x0>;
- hw-variant = <0x1>;
- };
-
- aliases {
- ds1bkl0 = &pwmbacklight;
- ds1bkl1 = &tps_bl;
- ds1timing = &timing0;
- ds1ctrl = &lcdc;
- gpmc = &gpmc;
- mmc = &mmc2;
- spi0 = &spi0;
- fset = &fset;
- };
-
- chosen {
- bootargs = "console=ttyO0,115200 earlyprintk";
- stdout-path = &uart0;
- };
-
- memory {
- device_type = "memory";
- reg = <0x80000000 0x10000000>; /* 256 MB */
- };
-
- panel {
- status = "disabled";
-
- compatible = "ti,tilcdc,panel";
- enable-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
-
- backlight = <&pwmbacklight>;
- bkl-pwm = <&pwmbacklight>;
- bkl-tps = <&tps_bl>;
-
- panel-info {
- ac-bias = <255>;
- ac-bias-intrpt = <0>;
- dma-burst-sz = <16>;
- bpp = <32>;
- fdd = <0x80>;
- sync-edge = <0>;
- sync-ctrl = <1>;
- raster-order = <0>;
- fifo-th = <0>;
- };
-
- display-timings {
- native-mode = <&timing0>;
- timing0: lcd {
- clock-frequency = <32000000>;
- hactive = <800>;
- vactive = <480>;
- hfront-porch = <2>;
- hback-porch = <192>;
- hsync-len = <1>;
- vfront-porch = <20>;
- vback-porch = <2>;
- vsync-len = <1>;
- hsync-active = <1>;
- vsync-active = <1>;
- pupdelay = <10>;
- pondelay = <10>;
- };
- };
- };
-
- vmmcsd_fixed: fixedregulator@0 {
- compatible = "regulator-fixed";
- regulator-name = "vmmcsd_fixed";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- };
-
- pwm0: omap-pwm@timer5 {
- compatible = "ti,omap-dmtimer-pwm";
- ti,timers = <&timer5>;
- #pwm-cells = <3>;
- };
-
- pwm1: omap-pwm@timer6 {
- compatible = "ti,omap-dmtimer-pwm";
- ti,timers = <&timer6>;
- #pwm-cells = <3>;
- };
-
- beeper: pwm-beep {
- compatible = "pwm-beeper";
- pwms = <&pwm0 0 0 0>;
- };
-
- pwmbacklight: pwm-bkl {
- compatible = "pwm-backlight";
- pwms = <&pwm1 0 5000000 0>;
-
- default-brightness-level = <255>;
- brightness-levels = <0 16 32 64 128 170 202 234 255>;
-
- power-supply = <&vmmcsd_fixed>;
- enable-gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
- };
-};
-
-&uart0 { /* console uart */
- u-boot,dm-spl;
- status = "okay";
-};
-
-&uart1 {
- status = "okay";
-};
-
-&i2c0 {
- u-boot,dm-spl;
- status = "okay";
- clock-frequency = <400000>;
-
- tps: tps@24 { /* PMIC controller */
- u-boot,dm-spl;
- reg = <0x24>;
- compatible = "ti,tps65217";
-
- tps_bl: backlight {
- compatible = "ti,tps65217-bl";
- isel = <1>; /* 1 - ISET1, 2 ISET2 */
- fdim = <1000>; /* TPS65217_BL_FDIM_1kHZ */
- default-brightness = <50>;
- };
- };
-};
-
-&i2c2 {
- status = "okay";
- clock-frequency = <100000>;
-};
-
-&spi0 {
- u-boot,dm-spl;
- status = "okay";
-
- cs-gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>,
- <&gpio0 6 GPIO_ACTIVE_HIGH>,
- <0>,
- <0>;
-
- spi-max-frequency = <24000000>;
-
- spi_flash: spiflash@0 {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
- compatible = "spidev", "jedec,spi-nor";
- spi-max-frequency = <24000000>;
- reg = <0>;
- };
-};
-
-&edma {
- status = "okay";
-};
-
-&cppi41dma {
- status = "okay";
-};
-
-&usb {
- status = "okay";
-};
-
-&usb_ctrl_mod {
- status = "okay";
-};
-
-&usb0_phy {
- status = "okay";
-};
-
-&usb1_phy {
- status = "okay";
-};
-
-&usb0 {
- status = "okay";
- dr_mode = "host";
-};
-
-&usb1 {
- status = "okay";
- dr_mode = "host";
-};
-
-&davinci_mdio {
- status = "okay";
-
- phy0: ethernet-phy@0 {
- reg = <1>;
- };
-
- phy1: ethernet-phy@1 {
- reg = <2>;
- };
-};
-
-&mac {
- status = "okay";
-};
-
-&cpsw_emac0 {
- phy-handle = <&phy0>;
- dual_emac_res_vlan = <1>;
- phy-mode = "mii";
-};
-
-&cpsw_emac1 {
- phy-handle = <&phy1>;
- dual_emac_res_vlan = <2>;
- phy-mode = "mii";
-};
-
-&mmc1 {
- u-boot,dm-spl;
- vmmc-supply = <&vmmcsd_fixed>;
- bus-width = <0x4>;
- ti,non-removable;
- ti,needs-special-hs-handling;
- ti,vcc-aux-disable-is-sleep;
- status = "okay";
-};
-
-&mmc2 {
- u-boot,dm-spl;
- vmmc-supply = <&vmmcsd_fixed>;
- bus-width = <0x8>;
- ti,non-removable;
- ti,needs-special-hs-handling;
- ti,vcc-aux-disable-is-sleep;
- status = "okay";
-};
-
-&l4_per {
-
- segment@300000 {
-
- target-module@e000 {
- u-boot,dm-pre-reloc;
-
- lcdc: lcdc@0 {
- u-boot,dm-pre-reloc;
- status = "disabled";
- };
- };
- };
-};
-
-&elm {
- status = "okay";
-};
-
-&sham {
- status = "okay";
-};
-
-&aes {
- status = "okay";
-};
-
-&gpio0 {
- u-boot,dm-spl;
- ti,no-reset-on-init;
-};
-
-&gpio1 {
- u-boot,dm-spl;
- ti,no-reset-on-init;
-};
-
-&gpio2 {
- u-boot,dm-spl;
- ti,no-reset-on-init;
-};
-
-&gpio3 {
- u-boot,dm-spl;
- ti,no-reset-on-init;
-};
-
-&wdt2 {
- ti,no-reset-on-init;
- ti,no-idle-on-init;
-};
-
-&tscadc {
- status = "okay";
- tsc {
- ti,wires = <4>;
- ti,x-plate-resistance = <200>;
- ti,zx-cutoff-ratio = <40>;
- ti,min_deviation = <60>;
- ti,max_deviation = <600>;
- ti,coordinate-readouts = <5>;
- ti,wire-config = <0x00 0x11 0x22 0x33>;
-
- bnr-buttons {
- Home-Button {};
- };
- };
-
- adc {
- ti,adc-channels = <5 6 7>;
- };
-};
-
-&timer6 { /* used for cpsw end device */
- status = "okay";
- ti,no-reset-on-init;
- ti,no-idle-on-init;
-};
-
-&timer7 { /* used for cpsw end device */
- status = "okay";
- ti,no-reset-on-init;
- ti,no-idle-on-init;
-};
-
-&wdt2 {
- status = "okay";
- ti,no-reset-on-init;
- ti,no-idle-on-init;
-};
-
-&epwmss0 {
- status = "okay";
-};
-
-&tscadc {
- status = "okay";
-};
-
-&dcan0 {
- status = "okay";
-};
-
-&dcan1 {
- status = "okay";
-};
-
-&sham {
- status = "disabled";
-};
-
-&aes {
- status = "disabled";
-};
-
-&rng {
- status = "disabled";
-};
diff --git a/board/BuR/brppt1/board.c b/board/BuR/brppt1/board.c
index 7df37e4e66..c8dc186cdd 100644
--- a/board/BuR/brppt1/board.c
+++ b/board/BuR/brppt1/board.c
@@ -151,9 +151,7 @@ int board_init(void)
hw_watchdog_init();
#endif
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-#ifdef CONFIG_MTD_RAW_NAND
- gpmc_init();
-#endif
+
return 0;
}
diff --git a/board/BuR/brppt1/mux.c b/board/BuR/brppt1/mux.c
index b863d37335..5d2c7a201e 100644
--- a/board/BuR/brppt1/mux.c
+++ b/board/BuR/brppt1/mux.c
@@ -26,6 +26,7 @@ static struct module_pin_mux uart0_pin_mux[] = {
{OFFSET(uart0_txd), (MODE(0) | PULLUDEN)},
{-1},
};
+
static struct module_pin_mux uart1_pin_mux[] = {
/* UART1_RTS as I2C2-SCL */
{OFFSET(uart1_rtsn), (MODE(3) | PULLUDEN | PULLUP_EN | RXACTIVE)},
@@ -37,7 +38,7 @@ static struct module_pin_mux uart1_pin_mux[] = {
{OFFSET(uart1_txd), (MODE(0) | PULLUDEN)},
{-1},
};
-#ifdef CONFIG_MMC
+
static struct module_pin_mux mmc1_pin_mux[] = {
{OFFSET(gpmc_ad7), (MODE(1) | RXACTIVE | PULLUP_EN)}, /* MMC1_DAT7 */
{OFFSET(gpmc_ad6), (MODE(1) | RXACTIVE | PULLUP_EN)}, /* MMC1_DAT6 */
@@ -54,7 +55,7 @@ static struct module_pin_mux mmc1_pin_mux[] = {
{OFFSET(gpmc_advn_ale), (MODE(7) | RXACTIVE | PULLUP_EN)},/* MMC1_CD */
{-1},
};
-#endif
+
static struct module_pin_mux i2c0_pin_mux[] = {
/* I2C_DATA */
{OFFSET(i2c0_sda), (MODE(0) | RXACTIVE | PULLUDEN | SLEWCTRL)},
@@ -118,26 +119,7 @@ static struct module_pin_mux mii2_pin_mux[] = {
{OFFSET(gpmc_be1n), (MODE(1) | RXACTIVE)},/* MII1_COL */
{-1},
};
-#ifdef CONFIG_MTD_RAW_NAND
-static struct module_pin_mux nand_pin_mux[] = {
- {OFFSET(gpmc_ad0), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD0 */
- {OFFSET(gpmc_ad1), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD1 */
- {OFFSET(gpmc_ad2), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD2 */
- {OFFSET(gpmc_ad3), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD3 */
- {OFFSET(gpmc_ad4), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD4 */
- {OFFSET(gpmc_ad5), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD5 */
- {OFFSET(gpmc_ad6), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD6 */
- {OFFSET(gpmc_ad7), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD7 */
- {OFFSET(gpmc_clk), (MODE(2) | RXACTIVE | PULLUP_EN)}, /* NAND WAIT */
- {OFFSET(gpmc_wpn), (MODE(7) | PULLUP_EN | RXACTIVE)}, /* NAND_WPN */
- {OFFSET(gpmc_csn0), (MODE(0) | PULLUDEN)}, /* NAND_CS0 */
- {OFFSET(gpmc_advn_ale), (MODE(0) | PULLUDEN)}, /* NAND_ADV_ALE */
- {OFFSET(gpmc_oen_ren), (MODE(0) | PULLUDEN)}, /* NAND_OE */
- {OFFSET(gpmc_wen), (MODE(0) | PULLUDEN)}, /* NAND_WEN */
- {OFFSET(gpmc_be0n_cle), (MODE(0) | PULLUDEN)}, /* NAND_BE_CLE */
- {-1},
-};
-#endif
+
static struct module_pin_mux gpIOs[] = {
/* GPIO0_6 (SPI0_CS1) - 3v3_PWR_nEN (Display Power Supply) */
{OFFSET(spi0_cs1), (MODE(7) | PULLUDEN | PULLUP_EN | RXACTIVE)},
@@ -180,14 +162,6 @@ static struct module_pin_mux gpIOs[] = {
{OFFSET(mcasp0_axr0), (MODE(7) | PULLUDDIS) },
/* GPIO3_17 (MCASP0_AHCLKR) - ETH2_LEDY */
{OFFSET(mcasp0_ahclkr), (MODE(7) | PULLUDDIS) },
-#ifndef CONFIG_MTD_RAW_NAND
- /* GPIO2_3 - NAND_OE */
- {OFFSET(gpmc_oen_ren), (MODE(7) | PULLDOWN_EN | RXACTIVE)},
- /* GPIO2_4 - NAND_WEN */
- {OFFSET(gpmc_wen), (MODE(7) | PULLDOWN_EN | RXACTIVE)},
- /* GPIO2_5 - NAND_BE_CLE */
- {OFFSET(gpmc_be0n_cle), (MODE(7) | PULLDOWN_EN | RXACTIVE)},
-#endif
{-1},
};
@@ -222,7 +196,6 @@ static struct module_pin_mux lcd_pin_mux[] = {
{OFFSET(lcd_hsync), (MODE(0) | PULLUDDIS)}, /* LCD-HSync */
{OFFSET(lcd_ac_bias_en), (MODE(0) | PULLUDDIS)},/* LCD-DE */
{OFFSET(lcd_pclk), (MODE(0) | PULLUDDIS)}, /* LCD-CLK */
-
{-1},
};
@@ -241,11 +214,7 @@ void enable_board_pin_mux(void)
configure_module_pin_mux(i2c0_pin_mux);
configure_module_pin_mux(mii1_pin_mux);
configure_module_pin_mux(mii2_pin_mux);
-#ifdef CONFIG_MTD_RAW_NAND
- configure_module_pin_mux(nand_pin_mux);
-#elif defined(CONFIG_MMC)
configure_module_pin_mux(mmc1_pin_mux);
-#endif
configure_module_pin_mux(spi0_pin_mux);
configure_module_pin_mux(lcd_pin_mux);
configure_module_pin_mux(uart1_pin_mux);
diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig
deleted file mode 100644
index c5981bad49..0000000000
--- a/configs/brppt1_nand_defconfig
+++ /dev/null
@@ -1,122 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_OMAP2PLUS=y
-CONFIG_SYS_MALLOC_LEN=0x500000
-CONFIG_SPL_GPIO=y
-CONFIG_SPL_LIBCOMMON_SUPPORT=y
-CONFIG_SPL_LIBGENERIC_SUPPORT=y
-CONFIG_NR_DRAM_BANKS=1
-CONFIG_ENV_SIZE=0x10000
-CONFIG_ENV_OFFSET=0x60000
-CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="am335x-brppt1-nand"
-CONFIG_AM33XX=y
-CONFIG_TARGET_BRPPT1=y
-CONFIG_SPL_SERIAL=y
-CONFIG_SPL=y
-CONFIG_SYS_LOAD_ADDR=0x80000000
-CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
-CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x4030ff00
-# CONFIG_EXPERT is not set
-# CONFIG_FIT is not set
-CONFIG_OF_BOARD_SETUP=y
-CONFIG_BOOTDELAY=0
-CONFIG_USE_BOOTCOMMAND=y
-CONFIG_BOOTCOMMAND="run b_default"
-CONFIG_USE_PREBOOT=y
-CONFIG_PREBOOT="run cfgscr; run brdefaultip"
-CONFIG_SYS_CONSOLE_IS_IN_ENV=y
-CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
-CONFIG_SYS_CONSOLE_INFO_QUIET=y
-# CONFIG_DISPLAY_CPUINFO is not set
-# CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_ARCH_MISC_INIT=y
-CONFIG_SPL_SYS_MALLOC_SIMPLE=y
-CONFIG_SYS_SPL_MALLOC=y
-CONFIG_SYS_SPL_MALLOC_SIZE=0x500000
-# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
-CONFIG_SPL_I2C=y
-CONFIG_SPL_NAND_DRIVERS=y
-CONFIG_SPL_NAND_ECC=y
-CONFIG_SPL_NAND_BASE=y
-CONFIG_SPL_POWER=y
-CONFIG_SPL_WATCHDOG=y
-CONFIG_SPL_YMODEM_SUPPORT=y
-CONFIG_HUSH_PARSER=y
-CONFIG_SYS_MAXARGS=64
-CONFIG_SYS_CBSIZE=512
-CONFIG_SYS_PBSIZE=532
-CONFIG_CMD_BOOTZ=y
-CONFIG_SYS_BOOTM_LEN=0x2000000
-# CONFIG_CMD_IMI is not set
-# CONFIG_CMD_XIMG is not set
-# CONFIG_CMD_EDITENV is not set
-# CONFIG_CMD_CRC32 is not set
-# CONFIG_CMD_FLASH is not set
-CONFIG_CMD_GPIO=y
-CONFIG_CMD_I2C=y
-# CONFIG_CMD_LOADS is not set
-CONFIG_CMD_NAND=y
-CONFIG_CMD_PART=y
-CONFIG_CMD_USB=y
-# CONFIG_CMD_ITEST is not set
-CONFIG_CMD_DHCP=y
-CONFIG_BOOTP_MAY_FAIL=y
-# CONFIG_CMD_NFS is not set
-CONFIG_SYS_DISABLE_AUTOLOAD=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_BOOTCOUNT=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_TIME=y
-CONFIG_CMD_EXT4=y
-CONFIG_CMD_EXT4_WRITE=y
-CONFIG_CMD_FAT=y
-CONFIG_CMD_FS_GENERIC=y
-CONFIG_CMD_MTDPARTS=y
-CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
-CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:128k(MLO),128k(cfgscr),128k(dtb),128k(u-boot-env),512k(u-boot),4m(kernel),128m(rootfs),-(user)"
-# CONFIG_SPL_DOS_PARTITION is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clocks clock-names
interrupt-parent interrupt-controller interrupt-cells dma-names dmas "
-CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_IS_IN_NAND=y
-CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-CONFIG_VERSION_VARIABLE=y
-CONFIG_NET_RETRY_COUNT=10
-CONFIG_BOOTP_SEND_HOSTNAME=y
-CONFIG_NET_RANDOM_ETHADDR=y
-CONFIG_NETCONSOLE=y
-CONFIG_DM=y
-CONFIG_SPL_DM=y
-CONFIG_SPL_DM_SEQ_ALIAS=y
-# CONFIG_OF_TRANSLATE is not set
-CONFIG_BOOTCOUNT_LIMIT=y
-CONFIG_DM_I2C=y
-CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
-CONFIG_MISC=y
-# CONFIG_MMC is not set
-CONFIG_MTD=y
-CONFIG_MTD_RAW_NAND=y
-CONFIG_SYS_NAND_BLOCK_SIZE=0x20000
-CONFIG_SYS_NAND_PAGE_COUNT=0x40
-CONFIG_SYS_NAND_PAGE_SIZE=0x800
-CONFIG_SYS_NAND_OOBSIZE=0x40
-CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
-CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000
-CONFIG_PHY_NATSEMI=y
-CONFIG_DRIVER_TI_CPSW=y
-CONFIG_DM_PMIC=y
-# CONFIG_SPL_DM_PMIC is not set
-CONFIG_PMIC_TPS65217=y
-CONFIG_DM_SERIAL=y
-CONFIG_USB=y
-CONFIG_USB_MUSB_HOST=y
-CONFIG_USB_MUSB_GADGET=y
-CONFIG_USB_MUSB_TI=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_GADGET=y
-CONFIG_FAT_WRITE=y
-CONFIG_LZO=y
-# CONFIG_OF_LIBFDT_OVERLAY is not set
-# CONFIG_EFI_LOADER is not set
diff --git a/configs/brppt1_spi_defconfig b/configs/brppt1_spi_defconfig
deleted file mode 100644
index fa6b840d9e..0000000000
--- a/configs/brppt1_spi_defconfig
+++ /dev/null
@@ -1,130 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_OMAP2PLUS=y
-CONFIG_SYS_MALLOC_LEN=0x500000
-CONFIG_SYS_MALLOC_F_LEN=0x4000
-CONFIG_SPL_GPIO=y
-CONFIG_SPL_LIBCOMMON_SUPPORT=y
-CONFIG_SPL_LIBGENERIC_SUPPORT=y
-CONFIG_NR_DRAM_BANKS=1
-CONFIG_ENV_SIZE=0x10000
-CONFIG_ENV_OFFSET=0x20000
-CONFIG_ENV_SECT_SIZE=0x10000
-CONFIG_DM_GPIO=y
-CONFIG_SPL_DM_SPI=y
-CONFIG_DEFAULT_DEVICE_TREE="am335x-brppt1-spi"
-CONFIG_AM33XX=y
-CONFIG_TARGET_BRPPT1=y
-CONFIG_SPL_SERIAL=y
-CONFIG_SPL=y
-CONFIG_ENV_OFFSET_REDUND=0x30000
-CONFIG_SPL_SPI_FLASH_SUPPORT=y
-CONFIG_SPL_SPI=y
-CONFIG_SYS_LOAD_ADDR=0x80000000
-CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
-CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x4030ff00
-# CONFIG_EXPERT is not set
-# CONFIG_FIT is not set
-CONFIG_OF_BOARD_SETUP=y
-CONFIG_SPI_BOOT=y
-CONFIG_BOOTDELAY=0
-CONFIG_USE_BOOTCOMMAND=y
-CONFIG_BOOTCOMMAND="run b_default"
-CONFIG_USE_PREBOOT=y
-CONFIG_PREBOOT="run cfgscr; run brdefaultip"
-CONFIG_SYS_CONSOLE_IS_IN_ENV=y
-CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
-CONFIG_SYS_CONSOLE_INFO_QUIET=y
-# CONFIG_DISPLAY_CPUINFO is not set
-# CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_ARCH_MISC_INIT=y
-CONFIG_SPL_SYS_MALLOC_SIMPLE=y
-CONFIG_SYS_SPL_MALLOC=y
-CONFIG_SYS_SPL_MALLOC_SIZE=0x500000
-# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
-CONFIG_SPL_I2C=y
-# CONFIG_SPL_NAND_SUPPORT is not set
-CONFIG_SPL_DM_SPI_FLASH=y
-CONFIG_SPL_POWER=y
-CONFIG_SPL_SPI_LOAD=y
-CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
-CONFIG_SPL_WATCHDOG=y
-CONFIG_SPL_YMODEM_SUPPORT=y
-CONFIG_HUSH_PARSER=y
-CONFIG_SYS_MAXARGS=64
-CONFIG_SYS_CBSIZE=512
-CONFIG_SYS_PBSIZE=532
-CONFIG_CMD_BOOTZ=y
-CONFIG_SYS_BOOTM_LEN=0x2000000
-# CONFIG_CMD_IMI is not set
-# CONFIG_CMD_XIMG is not set
-# CONFIG_CMD_EDITENV is not set
-# CONFIG_CMD_CRC32 is not set
-# CONFIG_CMD_FLASH is not set
-CONFIG_CMD_GPIO=y
-CONFIG_CMD_I2C=y
-# CONFIG_CMD_LOADS is not set
-CONFIG_CMD_MMC=y
-CONFIG_CMD_BKOPS_ENABLE=y
-CONFIG_CMD_PART=y
-CONFIG_CMD_USB=y
-# CONFIG_CMD_ITEST is not set
-CONFIG_CMD_DHCP=y
-CONFIG_BOOTP_MAY_FAIL=y
-# CONFIG_CMD_NFS is not set
-CONFIG_SYS_DISABLE_AUTOLOAD=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_BOOTCOUNT=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_TIME=y
-CONFIG_CMD_EXT4=y
-CONFIG_CMD_EXT4_WRITE=y
-CONFIG_CMD_FAT=y
-CONFIG_CMD_FS_GENERIC=y
-# CONFIG_SPL_DOS_PARTITION is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clocks clock-names
interrupt-parent interrupt-controller interrupt-cells dma-names dmas "
-CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-CONFIG_VERSION_VARIABLE=y
-CONFIG_NET_RETRY_COUNT=10
-CONFIG_BOOTP_SEND_HOSTNAME=y
-CONFIG_NET_RANDOM_ETHADDR=y
-CONFIG_NETCONSOLE=y
-CONFIG_DM=y
-CONFIG_SPL_DM=y
-CONFIG_SPL_DM_SEQ_ALIAS=y
-# CONFIG_OF_TRANSLATE is not set
-CONFIG_BOOTCOUNT_LIMIT=y
-CONFIG_DM_I2C=y
-CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
-CONFIG_MISC=y
-CONFIG_MMC_OMAP_HS=y
-CONFIG_MTD=y
-CONFIG_DM_SPI_FLASH=y
-CONFIG_SF_DEFAULT_SPEED=24000000
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_WINBOND=y
-# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
-CONFIG_PHY_NATSEMI=y
-CONFIG_DRIVER_TI_CPSW=y
-CONFIG_DM_PMIC=y
-# CONFIG_SPL_DM_PMIC is not set
-CONFIG_PMIC_TPS65217=y
-CONFIG_DM_SERIAL=y
-CONFIG_SPI=y
-CONFIG_DM_SPI=y
-CONFIG_OMAP3_SPI=y
-CONFIG_USB=y
-CONFIG_USB_MUSB_HOST=y
-CONFIG_USB_MUSB_GADGET=y
-CONFIG_USB_MUSB_TI=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_GADGET=y
-CONFIG_FAT_WRITE=y
-CONFIG_LZO=y
-# CONFIG_OF_LIBFDT_OVERLAY is not set
-# CONFIG_EFI_LOADER is not set
diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h
index 6cb1a10600..481473ae2c 100644
--- a/include/configs/brppt1.h
+++ b/include/configs/brppt1.h
@@ -27,31 +27,7 @@
* the Linux kernel.
*/
-#ifdef CONFIG_SPL_OS_BOOT
-/* RAW SD card / eMMC */
-
-#endif /* CONFIG_SPL_OS_BOOT */
-
-#ifdef CONFIG_MTD_RAW_NAND
-#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE
-#endif /* CONFIG_MTD_RAW_NAND */
-
-#ifdef CONFIG_MTD_RAW_NAND
-#define NANDTGTS \
-"cfgscr=mw ${dtbaddr} 0; nand read ${cfgaddr} cfgscr && source ${cfgaddr};" \
-" fdt addr ${dtbaddr} || cp ${fdtcontroladdr} ${dtbaddr} 4000\0" \
-"nandargs=setenv bootargs console=${console} ${optargs} ${optargs_rot} " \
- "root=mtd6 rootfstype=jffs2 b_mode=${b_mode}\0" \
-"b_nand=nand read ${loadaddr} kernel; nand read ${dtbaddr} dtb; " \
- "run nandargs; run cfgscr; bootz ${loadaddr} - ${dtbaddr}\0" \
-"b_tgts_std=usb0 nand net\0" \
-"b_tgts_rcy=net usb0 nand\0" \
-"b_tgts_pme=usb0 nand net\0"
-#else
-#define NANDTGTS ""
-#endif /* CONFIG_MTD_RAW_NAND */
-
-#define MMCSPI_TGTS \
+#define MMC_TGTS \
"t30args#0=setenv bootargs ${optargs_rot} ${optargs} console=${console} " \
"b_mode=${b_mode} root=/dev/mmcblk0p2 rootfstype=ext4\0" \
"b_t30lgcy#0=" \
@@ -76,7 +52,7 @@
#ifdef CONFIG_ENV_IS_IN_MMC
#define MMCTGTS \
-MMCSPI_TGTS \
+MMC_TGTS \
"cfgscr=mw ${dtbaddr} 0;" \
" mmc dev 1; mmc read ${cfgaddr} 200 80; source ${cfgaddr};" \
" fdt addr ${dtbaddr} || cp ${fdtcontroladdr} ${dtbaddr} 4000\0"
@@ -84,16 +60,6 @@ MMCSPI_TGTS \
#define MMCTGTS ""
#endif /* CONFIG_MMC */
-#ifdef CONFIG_SPI
-#define SPITGTS \
-MMCSPI_TGTS \
-"cfgscr=mw ${dtbaddr} 0;" \
-" sf probe; sf read ${cfgaddr} 0xC0000 10000; source ${cfgaddr};" \
-" fdt addr ${dtbaddr} || cp ${fdtcontroladdr} ${dtbaddr} 4000\0"
-#else
-#define SPITGTS ""
-#endif /* CONFIG_SPI */
-
#define LOAD_OFFSET(x) 0x8##x
#define CONFIG_EXTRA_ENV_SETTINGS \
@@ -110,8 +76,6 @@ BUR_COMMON_ENV \
"b_usb0=usb start && load usb 0 ${scraddr} bootscr.img && source ${scraddr}\0"
\
"b_net=tftp ${scraddr} netscript.img && source ${scraddr}\0" \
MMCTGTS \
-SPITGTS \
-NANDTGTS \
"b_deftgts=if test ${b_mode} = 12; then setenv b_tgts ${b_tgts_pme};" \
" elif test ${b_mode} = 0; then setenv b_tgts ${b_tgts_rcy};" \
" else setenv b_tgts ${b_tgts_std}; fi\0" \
@@ -119,28 +83,4 @@ NANDTGTS \
" do echo \"### booting ${target} ###\"; run b_${target};" \
" if test ${b_break} = 1; then; exit; fi; done\0"
-#ifdef CONFIG_MTD_RAW_NAND
-/*
- * GPMC block. We support 1 device and the physical address to
- * access CS0 at is 0x8000000.
- */
-#define CONFIG_SYS_MAX_NAND_DEVICE 1
-#define CONFIG_SYS_NAND_BASE 0x8000000
-/* don't change OMAP_ELM, ECCSCHEME. ROM code only supports this */
-#define CONFIG_SYS_NAND_ECCPOS {2, 3, 4, 5, 6, 7, 8, 9, \
- 10, 11, 12, 13, 14, 15, 16, 17, \
- 18, 19, 20, 21, 22, 23, 24, 25, \
- 26, 27, 28, 29, 30, 31, 32, 33, \
- 34, 35, 36, 37, 38, 39, 40, 41, \
- 42, 43, 44, 45, 46, 47, 48, 49, \
- 50, 51, 52, 53, 54, 55, 56, 57, }
-
-#define CONFIG_SYS_NAND_ECCSIZE 512
-#define CONFIG_SYS_NAND_ECCBYTES 14
-
-#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE
-
-#define CONFIG_NAND_OMAP_GPMC_WSCFG 1
-#endif /* CONFIG_MTD_RAW_NAND */
-
#endif /* ! __CONFIG_BRPPT1_H__ */
--
2.37.2
