aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-02-20 09:36:46 -0500
committerTom Rini <trini@konsulko.com>2021-02-20 09:38:30 -0500
commit3c687578305567348e23fc82467a94f6f8ecde95 (patch)
tree7ba28b1874638c7aaf0812872f6ada6b62ff7c24
parentba7ed7ecf69597b24c061093431ff675697dc44d (diff)
downloadu-boot-WIP/make-DM_MMC-migration-fatal.zip
u-boot-WIP/make-DM_MMC-migration-fatal.tar.gz
u-boot-WIP/make-DM_MMC-migration-fatal.tar.bz2
arm: Remove kc1 boardWIP/make-DM_MMC-migration-fatal
This board has not been converted to CONFIG_DM_MMC by the deadline. Remove it. Patch-cc: Paul Kocialkowski <contact@paulk.fr> Signed-off-by: Tom Rini <trini@konsulko.com>
-rw-r--r--arch/arm/mach-omap2/omap4/Kconfig4
-rw-r--r--board/amazon/kc1/Kconfig12
-rw-r--r--board/amazon/kc1/MAINTAINERS6
-rw-r--r--board/amazon/kc1/Makefile7
-rw-r--r--board/amazon/kc1/kc1.c184
-rw-r--r--board/amazon/kc1/kc1.h97
-rw-r--r--configs/kc1_defconfig40
-rw-r--r--include/configs/kc1.h150
8 files changed, 0 insertions, 500 deletions
diff --git a/arch/arm/mach-omap2/omap4/Kconfig b/arch/arm/mach-omap2/omap4/Kconfig
index 899289b..cdac11c 100644
--- a/arch/arm/mach-omap2/omap4/Kconfig
+++ b/arch/arm/mach-omap2/omap4/Kconfig
@@ -10,9 +10,6 @@ config TARGET_OMAP4_PANDA
config TARGET_OMAP4_SDP4430
bool "TI OMAP4 SDP4430"
-config TARGET_KC1
- bool "Amazon Kindle Fire (first generation)"
-
endchoice
config SYS_SOC
@@ -20,6 +17,5 @@ config SYS_SOC
source "board/ti/panda/Kconfig"
source "board/ti/sdp4430/Kconfig"
-source "board/amazon/kc1/Kconfig"
endif
diff --git a/board/amazon/kc1/Kconfig b/board/amazon/kc1/Kconfig
deleted file mode 100644
index 1b46a8f..0000000
--- a/board/amazon/kc1/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-if TARGET_KC1
-
-config SYS_BOARD
- default "kc1"
-
-config SYS_VENDOR
- default "amazon"
-
-config SYS_CONFIG_NAME
- default "kc1"
-
-endif
diff --git a/board/amazon/kc1/MAINTAINERS b/board/amazon/kc1/MAINTAINERS
deleted file mode 100644
index 7e596d9..0000000
--- a/board/amazon/kc1/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-KC1 BOARD
-M: Paul Kocialkowski <contact@paulk.fr>
-S: Maintained
-F: board/amazon/kc1/
-F: include/configs/kc1.h
-F: configs/kc1_defconfig
diff --git a/board/amazon/kc1/Makefile b/board/amazon/kc1/Makefile
deleted file mode 100644
index bad24dc..0000000
--- a/board/amazon/kc1/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Amazon Kindle Fire (first generation) codename kc1 config
-#
-# Copyright (C) 2016 Paul Kocialkowski <contact@paulk.fr>
-
-obj-y := kc1.o
diff --git a/board/amazon/kc1/kc1.c b/board/amazon/kc1/kc1.c
deleted file mode 100644
index 75fb140..0000000
--- a/board/amazon/kc1/kc1.c
+++ /dev/null
@@ -1,184 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Amazon Kindle Fire (first generation) codename kc1 config
- *
- * Copyright (C) 2016 Paul Kocialkowski <contact@paulk.fr>
- */
-
-#include <config.h>
-#include <common.h>
-#include <env.h>
-#include <fastboot.h>
-#include <init.h>
-#include <asm/global_data.h>
-#include <linux/ctype.h>
-#include <linux/usb/musb.h>
-#include <asm/omap_musb.h>
-#include <asm/arch/sys_proto.h>
-#include <asm/arch/mmc_host_def.h>
-#include <asm/gpio.h>
-#include <asm/emif.h>
-#include <twl6030.h>
-#include "kc1.h"
-#include <asm/mach-types.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-const struct omap_sysinfo sysinfo = {
- .board_string = "kc1"
-};
-
-static struct musb_hdrc_config musb_config = {
- .multipoint = 1,
- .dyn_fifo = 1,
- .num_eps = 16,
- .ram_bits = 12
-};
-
-static struct omap_musb_board_data musb_board_data = {
- .interface_type = MUSB_INTERFACE_UTMI,
-};
-
-static struct musb_hdrc_platform_data musb_platform_data = {
- .mode = MUSB_PERIPHERAL,
- .config = &musb_config,
- .power = 100,
- .platform_ops = &omap2430_ops,
- .board_data = &musb_board_data,
-};
-
-
-void set_muxconf_regs(void)
-{
- do_set_mux((*ctrl)->control_padconf_core_base, core_padconf_array,
- sizeof(core_padconf_array) / sizeof(struct pad_conf_entry));
-}
-
-struct lpddr2_device_details *emif_get_device_details(u32 emif_nr, u8 cs,
- struct lpddr2_device_details *lpddr2_dev_details)
-{
- if (cs == CS1)
- return NULL;
-
- *lpddr2_dev_details = elpida_2G_S4_details;
-
- return lpddr2_dev_details;
-}
-
-void emif_get_device_timings(u32 emif_nr,
- const struct lpddr2_device_timings **cs0_device_timings,
- const struct lpddr2_device_timings **cs1_device_timings)
-{
- *cs0_device_timings = &elpida_2G_S4_timings;
- *cs1_device_timings = NULL;
-}
-
-int board_init(void)
-{
- /* GPMC init */
- gpmc_init();
-
- /* MACH number */
- gd->bd->bi_arch_number = MACH_TYPE_OMAP_4430SDP;
-
- /* ATAGs location */
- gd->bd->bi_boot_params = OMAP44XX_DRAM_ADDR_SPACE_START + 0x100;
-
- return 0;
-}
-
-int misc_init_r(void)
-{
- char reboot_mode[2] = { 0 };
- u32 data = 0;
- u32 value;
- int rc;
-
- /* Reboot mode */
-
- rc = omap_reboot_mode(reboot_mode, sizeof(reboot_mode));
-
- /* USB ID pin pull-up indicates factory (fastboot) cable detection. */
- gpio_request(KC1_GPIO_USB_ID, "USB_ID");
- gpio_direction_input(KC1_GPIO_USB_ID);
- value = gpio_get_value(KC1_GPIO_USB_ID);
-
- if (value)
- reboot_mode[0] = 'b';
-
- if (rc < 0 || reboot_mode[0] == 'o') {
- /*
- * When not rebooting, valid power on reasons are either the
- * power button, charger plug or USB plug.
- */
-
- data |= twl6030_input_power_button();
- data |= twl6030_input_charger();
- data |= twl6030_input_usb();
-
- if (!data)
- twl6030_power_off();
- }
-
- if (reboot_mode[0] > 0 && isascii(reboot_mode[0])) {
- if (!env_get("reboot-mode"))
- env_set("reboot-mode", (char *)reboot_mode);
- }
-
- omap_reboot_mode_clear();
-
- /* Serial number */
-
- omap_die_id_serial();
-
- /* MUSB */
-
- musb_register(&musb_platform_data, &musb_board_data, (void *)MUSB_BASE);
-
- return 0;
-}
-
-u32 get_board_rev(void)
-{
- u32 value = 0;
-
- gpio_request(KC1_GPIO_MBID0, "MBID0");
- gpio_request(KC1_GPIO_MBID1, "MBID1");
- gpio_request(KC1_GPIO_MBID2, "MBID2");
- gpio_request(KC1_GPIO_MBID3, "MBID3");
-
- gpio_direction_input(KC1_GPIO_MBID0);
- gpio_direction_input(KC1_GPIO_MBID1);
- gpio_direction_input(KC1_GPIO_MBID2);
- gpio_direction_input(KC1_GPIO_MBID3);
-
- value |= (gpio_get_value(KC1_GPIO_MBID0) << 0);
- value |= (gpio_get_value(KC1_GPIO_MBID1) << 1);
- value |= (gpio_get_value(KC1_GPIO_MBID2) << 2);
- value |= (gpio_get_value(KC1_GPIO_MBID3) << 3);
-
- return value;
-}
-
-void get_board_serial(struct tag_serialnr *serialnr)
-{
- omap_die_id_get_board_serial(serialnr);
-}
-
-int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason)
-{
- if (reason != FASTBOOT_REBOOT_REASON_BOOTLOADER)
- return -ENOTSUPP;
-
- return omap_reboot_mode_store("b");
-}
-
-int board_mmc_init(struct bd_info *bis)
-{
- return omap_mmc_init(1, 0, 0, -1, -1);
-}
-
-void board_mmc_power_init(void)
-{
- twl6030_power_mmc_init(1);
-}
diff --git a/board/amazon/kc1/kc1.h b/board/amazon/kc1/kc1.h
deleted file mode 100644
index da15b08..0000000
--- a/board/amazon/kc1/kc1.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Amazon Kindle Fire (first generation) codename kc1 config
- *
- * Copyright (C) 2016 Paul Kocialkowski <contact@paulk.fr>
- */
-
-#ifndef _KC1_H_
-#define _KC1_H_
-
-#include <asm/arch/mux_omap4.h>
-
-#define KC1_GPIO_USB_ID 52
-#define KC1_GPIO_MBID1 173
-#define KC1_GPIO_MBID0 174
-#define KC1_GPIO_MBID3 177
-#define KC1_GPIO_MBID2 178
-
-const struct pad_conf_entry core_padconf_array[] = {
- /* GPMC */
- { GPMC_AD0, (IEN | PTU | M1) }, /* sdmmc2_dat0 */
- { GPMC_AD1, (IEN | PTU | M1) }, /* sdmmc2_dat1 */
- { GPMC_AD2, (IEN | PTU | M1) }, /* sdmmc2_dat2 */
- { GPMC_AD3, (IEN | PTU | M1) }, /* sdmmc2_dat3 */
- { GPMC_AD4, (IEN | PTU | M1) }, /* sdmmc2_dat4 */
- { GPMC_AD5, (IEN | PTU | M1) }, /* sdmmc2_dat5 */
- { GPMC_AD6, (IEN | PTU | M1) }, /* sdmmc2_dat6 */
- { GPMC_AD7, (IEN | PTU | M1) }, /* sdmmc2_dat7 */
- { GPMC_NOE, (IEN | PTU | M1) }, /* sdmmc2_clk */
- { GPMC_NWE, (IEN | PTU | M1) }, /* sdmmc2_cmd */
- { GPMC_NCS2, (IEN | PTD | M3) }, /* gpio_52 */
- /* CAM */
- { CAM_SHUTTER, (IDIS | DIS | M7) }, /* safe_mode */
- { CAM_STROBE, (IDIS | DIS | M7) }, /* safe_mode */
- { CAM_GLOBALRESET, (IDIS | DIS | M7) }, /* safe_mode */
- /* HDQ */
- { HDQ_SIO, (IDIS | DIS | M7) }, /* safe_mode */
- /* I2C1 */
- { I2C1_SCL, (IEN | PTU | M0) }, /* i2c1_scl */
- { I2C1_SDA, (IEN | PTU | M0) }, /* i2c1_sda */
- /* I2C2 */
- { I2C2_SCL, (IEN | PTU | M0) }, /* i2c2_scl */
- { I2C2_SDA, (IEN | PTU | M0) }, /* i2c2_sda */
- /* I2C3 */
- { I2C3_SCL, (IEN | PTU | M0) }, /* i2c3_scl */
- { I2C3_SDA, (IEN | PTU | M0) }, /* i2c3_sda */
- /* I2C4 */
- { I2C4_SCL, (IEN | PTU | M0) }, /* i2c4_scl */
- { I2C4_SDA, (IEN | PTU | M0) }, /* i2c4_sda */
- /* MCSPI1 */
- { MCSPI1_CLK, (IDIS | DIS | M7) }, /* safe_mode */
- { MCSPI1_SOMI, (IDIS | DIS | M7) }, /* safe_mode */
- { MCSPI1_SIMO, (IDIS | DIS | M7) }, /* safe_mode */
- { MCSPI1_CS0, (IDIS | DIS | M7) }, /* safe_mode */
- { MCSPI1_CS1, (IDIS | DIS | M7) }, /* safe_mode */
- { MCSPI1_CS2, (IDIS | DIS | M7) }, /* safe_mode */
- { MCSPI1_CS3, (IDIS | DIS | M7) }, /* safe_mode */
- /* UART3 */
- { UART3_CTS_RCTX, (IDIS | DIS | M7) }, /* safe_mode */
- { UART3_RTS_SD, (IDIS | DIS | M7) }, /* safe_mode */
- { UART3_RX_IRRX, (IEN | DIS | M0) }, /* uart3_rx_irrx */
- { UART3_TX_IRTX, (IDIS | DIS | M0) }, /* uart3_tx_irtx */
- /* SDMMC5 */
- { SDMMC5_CLK, (IEN | PTU | M0) }, /* sdmmc5_clk */
- { SDMMC5_CMD, (IEN | PTU | M0) }, /* sdmmc5_cmd */
- { SDMMC5_DAT0, (IEN | PTU | M0) }, /* sdmmc5_dat0 */
- { SDMMC5_DAT1, (IEN | PTU | M0) }, /* sdmmc5_dat1 */
- { SDMMC5_DAT2, (IEN | PTU | M0) }, /* sdmmc5_dat2 */
- { SDMMC5_DAT3, (IEN | PTU | M0) }, /* sdmmc5_dat3 */
- /* MCSPI4 */
- { MCSPI4_CLK, (IEN | DIS | M0) }, /* mcspi4_clk */
- { MCSPI4_SIMO, (IEN | DIS | M0) }, /* mcspi4_simo */
- { MCSPI4_SOMI, (IEN | DIS | M0) }, /* mcspi4_somi */
- { MCSPI4_CS0, (IEN | PTD | M0) }, /* mcspi4_cs0 */
- /* UART4 */
- { UART4_RX, (IDIS | DIS | M4) }, /* gpio_155 */
- { UART4_TX, (IDIS | DIS | M7) }, /* safe_mode */
- /* UNIPRO */
- { UNIPRO_TX0, (IDIS | DIS | M7) }, /* safe_mode */
- { UNIPRO_TY0, (IDIS | DIS | M7) }, /* safe_mode */
- { UNIPRO_TX1, (IEN | DIS | M3) }, /* gpio_173 */
- { UNIPRO_TY1, (IEN | DIS | M3) }, /* gpio_174 */
- { UNIPRO_TX2, (IDIS | DIS | M7) }, /* safe_mode */
- { UNIPRO_TY2, (IDIS | DIS | M7) }, /* safe_mode */
- { UNIPRO_RX0, (IEN | DIS | M3) }, /* gpio_175 */
- { UNIPRO_RY0, (IEN | DIS | M3) }, /* gpio_176 */
- { UNIPRO_RX1, (IEN | DIS | M3) }, /* gpio_177 */
- { UNIPRO_RY1, (IEN | DIS | M3) }, /* gpio_178 */
- { UNIPRO_RX2, (IDIS | DIS | M7) }, /* safe_mode */
- { UNIPRO_RY2, (IDIS | DIS | M7) }, /* safe_mode */
- /* USBA0_OTG */
- { USBA0_OTG_CE, (IDIS | PTD | M0) }, /* usba0_otg_ce */
- { USBA0_OTG_DP, (IEN | DIS | M0) }, /* usba0_otg_dp */
- { USBA0_OTG_DM, (IEN | DIS | M0) }, /* usba0_otg_dm */
-};
-
-#endif
diff --git a/configs/kc1_defconfig b/configs/kc1_defconfig
deleted file mode 100644
index 5686b5a..0000000
--- a/configs/kc1_defconfig
+++ /dev/null
@@ -1,40 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_OMAP2PLUS=y
-CONFIG_SYS_TEXT_BASE=0x80100000
-CONFIG_NR_DRAM_BANKS=1
-CONFIG_SPL_TEXT_BASE=0x40300000
-CONFIG_OMAP44XX=y
-CONFIG_TARGET_KC1=y
-CONFIG_SPL=y
-CONFIG_DISTRO_DEFAULTS=y
-# CONFIG_USE_BOOTCOMMAND is not set
-CONFIG_SYS_CONSOLE_IS_IN_ENV=y
-# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
-CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y
-CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=2
-# CONFIG_SPL_NAND_SUPPORT is not set
-CONFIG_SYS_PROMPT="kc1 # "
-CONFIG_CMD_GPIO=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_MMC=y
-# CONFIG_CMD_SETEXPR is not set
-# CONFIG_CMD_NFS is not set
-CONFIG_ENV_OVERWRITE=y
-CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_FASTBOOT_BUF_ADDR=0x82000000
-CONFIG_FASTBOOT_BUF_SIZE=0x2000000
-CONFIG_FASTBOOT_FLASH=y
-CONFIG_FASTBOOT_FLASH_MMC_DEV=0
-CONFIG_SYS_OMAP24_I2C_SPEED=400000
-CONFIG_MMC_OMAP_HS=y
-CONFIG_CONS_INDEX=3
-CONFIG_SYS_NS16550=y
-CONFIG_USB=y
-CONFIG_USB_MUSB_GADGET=y
-CONFIG_USB_MUSB_OMAP2PLUS=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0451
-CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
-CONFIG_OF_LIBFDT=y
diff --git a/include/configs/kc1.h b/include/configs/kc1.h
deleted file mode 100644
index 4e9a567..0000000
--- a/include/configs/kc1.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Amazon Kindle Fire (first generation) codename kc1 config
- *
- * Copyright (C) 2016 Paul Kocialkowski <contact@paulk.fr>
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include <asm/arch/cpu.h>
-#include <asm/arch/omap.h>
-
-/*
- * Build
- */
-
-/*
- * CPU
- */
-
-#define CONFIG_SYS_L2_PL310 1
-#define CONFIG_SYS_PL310_BASE 0x48242000
-
-/*
- * Board
- */
-
-/*
- * Clocks
- */
-
-#define CONFIG_SYS_TIMERBASE GPT2_BASE
-#define CONFIG_SYS_PTV 2
-
-/*
- * DRAM
- */
-
-/*
- * Memory
- */
-
-#define CONFIG_SYS_SDRAM_BASE 0x80000000
-#define CONFIG_SYS_INIT_SP_ADDR (NON_SECURE_SRAM_END - \
- GENERATED_GBL_DATA_SIZE)
-
-#define CONFIG_SYS_MALLOC_LEN (1024 * 1024 + CONFIG_ENV_SIZE)
-
-/*
- * I2C
- */
-
-#define CONFIG_SYS_I2C
-#define CONFIG_I2C_MULTI_BUS
-
-/*
- * Power
- */
-
-#define CONFIG_TWL6030_POWER
-
-/*
- * Input
- */
-
-#define CONFIG_TWL6030_INPUT
-
-/*
- * SPL
- */
-
-#define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \
- CONFIG_SPL_TEXT_BASE)
-#define CONFIG_SPL_BSS_START_ADDR 0x80000000
-#define CONFIG_SPL_BSS_MAX_SIZE (512 * 1024)
-#define CONFIG_SYS_SPL_MALLOC_START 0x80208000
-#define CONFIG_SYS_SPL_MALLOC_SIZE (1024 * 1024)
-
-/*
- * Console
- */
-
-#define CONFIG_SYS_CBSIZE 512
-
-/*
- * Serial
- */
-
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE (-4)
-#define CONFIG_SYS_NS16550_CLK 48000000
-#define CONFIG_SYS_NS16550_COM3 UART3_BASE
-
-#define CONFIG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, \
- 115200 }
-
-/*
- * USB gadget
- */
-
-/*
- * Environment
- */
-
-#define CONFIG_EXTRA_ENV_SETTINGS \
- "kernel_addr_r=0x82000000\0" \
- "loadaddr=0x82000000\0" \
- "fdt_addr_r=0x88000000\0" \
- "fdtaddr=0x88000000\0" \
- "ramdisk_addr_r=0x88080000\0" \
- "pxefile_addr_r=0x80100000\0" \
- "scriptaddr=0x80000000\0" \
- "bootm_size=0x10000000\0" \
- "boot_mmc_dev=0\0" \
- "kernel_mmc_part=7\0" \
- "recovery_mmc_part=5\0" \
- "fdtfile=omap4-kc1.dtb\0" \
- "bootfile=/boot/extlinux/extlinux.conf\0" \
- "bootargs=console=ttyO2,115200 mem=512M\0"
-
-/*
- * ATAGs
- */
-
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
-#define CONFIG_SERIAL_TAG
-
-/*
- * Boot
- */
-
-#define CONFIG_SYS_LOAD_ADDR 0x82000000
-
-#define CONFIG_BOOTCOMMAND \
- "setenv boot_mmc_part ${kernel_mmc_part}; " \
- "if test reboot-${reboot-mode} = reboot-r; then " \
- "echo recovery; setenv boot_mmc_part ${recovery_mmc_part}; fi; " \
- "if test reboot-${reboot-mode} = reboot-b; then " \
- "echo fastboot; fastboot 0; fi; " \
- "part start mmc ${boot_mmc_dev} ${boot_mmc_part} boot_mmc_start; " \
- "part size mmc ${boot_mmc_dev} ${boot_mmc_part} boot_mmc_size; " \
- "mmc dev ${boot_mmc_dev}; " \
- "mmc read ${kernel_addr_r} ${boot_mmc_start} ${boot_mmc_size} && " \
- "bootm ${kernel_addr_r};"
-
-#endif