[U-Boot] [PATCH 2/8] arm: Remove h2200 board

Simon Glass
2016-10-20T19:06:54Z

This board has not been converted to DM_SERIAL by the deadline.
Remove it.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

arch/arm/Kconfig | 5 --
board/h2200/Kconfig | 9 ---
board/h2200/MAINTAINERS | 6 --
board/h2200/Makefile | 14 ----
board/h2200/h2200-header.S | 15 -----
board/h2200/h2200.c | 73 --------------------
configs/h2200_defconfig | 25 -------
include/configs/h2200.h | 155 -------------------------------------------
scripts/config_whitelist.txt | 1 -
9 files changed, 303 deletions(-)
delete mode 100644 board/h2200/Kconfig
delete mode 100644 board/h2200/MAINTAINERS
delete mode 100644 board/h2200/Makefile
delete mode 100644 board/h2200/h2200-header.S
delete mode 100644 board/h2200/h2200.c
delete mode 100644 configs/h2200_defconfig
delete mode 100644 include/configs/h2200.h

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 59c7bcc..26c8e2f 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -805,10 +805,6 @@ config TARGET_LS1046ARDB
development platform that supports the QorIQ LS1046A
Layerscape Architecture processor.

-config TARGET_H2200
- bool "Support h2200"
- select CPU_PXA
-
config TARGET_ZIPITZ2
bool "Support zipitz2"
select CPU_PXA
@@ -978,7 +974,6 @@ source "board/freescale/mx53smd/Kconfig"
source "board/freescale/s32v234evb/Kconfig"
source "board/freescale/vf610twr/Kconfig"
source "board/gumstix/pepper/Kconfig"
-source "board/h2200/Kconfig"
source "board/hisilicon/hikey/Kconfig"
source "board/imx31_phycore/Kconfig"
source "board/isee/igep0033/Kconfig"
diff --git a/board/h2200/Kconfig b/board/h2200/Kconfig
deleted file mode 100644
index c0e0c1e..0000000
--- a/board/h2200/Kconfig
+++ /dev/null
@@ -1,9 +0,0 @@
-if TARGET_H2200
-
-config SYS_BOARD
- default "h2200"
-
-config SYS_CONFIG_NAME
- default "h2200"
-
-endif
diff --git a/board/h2200/MAINTAINERS b/board/h2200/MAINTAINERS
deleted file mode 100644
index b66ff51..0000000
--- a/board/h2200/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-H2200 BOARD
-M: Lukasz Dalek <luk0104@gmail.com>
-S: Maintained
-F: board/h2200/
-F: include/configs/h2200.h
-F: configs/h2200_defconfig
diff --git a/board/h2200/Makefile b/board/h2200/Makefile
deleted file mode 100644
index e516e91..0000000
--- a/board/h2200/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# h2200 Support
-#
-# Copyright (C) 2012 Lukasz Dalek <luk0104@gmail.com>
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
-
-obj-y := h2200.o
-
-extra-y := h2200-header.bin
-
-$(obj)/h2200-header.bin: $(obj)/h2200-header.o
- $(OBJCOPY) -O binary $< $@
diff --git a/board/h2200/h2200-header.S b/board/h2200/h2200-header.S
deleted file mode 100644
index ac2e6b4..0000000
--- a/board/h2200/h2200-header.S
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * iPAQ h2200 header
- *
- * Copyright (C) 2012 Lukasz Dalek <luk0104@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
- .word 0xea0003fe /* b 0x1000 */
-
- .org 0x40
- .ascii "ECEC"
-
- .org 0x1000 - 1
- .byte 0x0
diff --git a/board/h2200/h2200.c b/board/h2200/h2200.c
deleted file mode 100644
index 01f8e67..0000000
--- a/board/h2200/h2200.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * iPAQ h2200 board configuration
- *
- * Copyright (C) 2012 Lukasz Dalek <luk0104@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#include <common.h>
-#include <asm/arch/pxa.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/io.h>
-#include <usb.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-int board_eth_init(bd_t *bis)
-{
- usb_eth_initialize(bis);
- return 0;
-}
-
-void reset_cpu(ulong ignore)
-{
- /* Enable VLIO interface on Hamcop */
- writeb(0x1, 0x4000);
-
- /* Reset board (cold reset) */
- writeb(0xff, 0x4002);
-}
-
-int board_init(void)
-{
- /* We have RAM, disable cache */
- dcache_disable();
- icache_disable();
-
- gd->bd->bi_arch_number = MACH_TYPE_H2200;
-
- /* adress of boot parameters */
- gd->bd->bi_boot_params = 0xa0000100;
-
- /* Let host see that device is disconnected */
- udc_disconnect();
- mdelay(500);
-
- return 0;
-}
-
-int dram_init(void)
-{
- /*
- * Everything except MSC0 was already set up by
- * 1st stage bootloader.
- *
- * This setting enables access to companion chip.
- */
- clrsetbits_le32(MSC0, 0xffffffff, CONFIG_SYS_MSC0_VAL);
- gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
- return 0;
-}
-
-#ifdef CONFIG_USB_GADGET_PXA2XX
-int board_usb_init(int index, enum usb_init_type init)
-{
- return 0;
-}
-
-int board_usb_cleanup(int index, enum usb_init_type init)
-{
- return 0;
-}
-#endif
diff --git a/configs/h2200_defconfig b/configs/h2200_defconfig
deleted file mode 100644
index ed2217a..0000000
--- a/configs/h2200_defconfig
+++ /dev/null
@@ -1,25 +0,0 @@
-CONFIG_ARM=y
-CONFIG_TARGET_H2200=y
-CONFIG_FIT=y
-# CONFIG_DISPLAY_CPUINFO is not set
-# CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_HUSH_PARSER=y
-CONFIG_SYS_PROMPT="> "
-# CONFIG_CMD_BDI is not set
-# CONFIG_CMD_CONSOLE is not set
-# CONFIG_CMD_BOOTD is not set
-# CONFIG_CMD_IMLS is not set
-# CONFIG_CMD_XIMG is not set
-# CONFIG_CMD_EDITENV is not set
-# CONFIG_CMD_SAVEENV is not set
-# CONFIG_CMD_ENV_EXISTS is not set
-# CONFIG_CMD_MEMORY is not set
-# CONFIG_CMD_LOADS is not set
-# CONFIG_CMD_FLASH is not set
-# CONFIG_CMD_FPGA is not set
-# CONFIG_CMD_ECHO is not set
-# CONFIG_CMD_ITEST is not set
-# CONFIG_CMD_SETEXPR is not set
-# CONFIG_CMD_NFS is not set
-CONFIG_CMD_PING=y
-# CONFIG_CMD_MISC is not set
diff --git a/include/configs/h2200.h b/include/configs/h2200.h
deleted file mode 100644
index 3e419c6..0000000
--- a/include/configs/h2200.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * iPAQ h2200 board configuration
- *
- * Copyright (C) 2012 Lukasz Dalek <luk0104@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#define MACH_TYPE_H2200 341
-#define CONFIG_MACH_TYPE MACH_TYPE_H2200
-
-#define CONFIG_CPU_PXA25X 1
-#define CONFIG_BOARD_H2200
-
-#define CONFIG_SYS_NO_FLASH
-
-#define CONFIG_NR_DRAM_BANKS 1
-#define PHYS_SDRAM_1 0xa0000000 /* SDRAM Bank #1 */
-#define PHYS_SDRAM_1_SIZE 0x04000000 /* 64 MB */
-
-#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
-#define CONFIG_SYS_SDRAM_SIZE PHYS_SDRAM_1_SIZE
-
-#define CONFIG_SYS_INIT_SP_ADDR 0xfffff800
-
-#define CONFIG_ENV_SIZE 0x00040000
-#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024)
-
-#define CONFIG_ENV_IS_NOWHERE
-#define CONFIG_SYS_MAXARGS 16
-#define CONFIG_SYS_LOAD_ADDR 0xa3000000 /* default load address */
-
-/*
- * iPAQ 1st stage bootloader loads 2nd stage bootloader
- * at address 0xa0040000 but bootloader requires header
- * which is 0x1000 long.
- *
- * --- Header begin ---
- * .word 0xea0003fe ; b 0x1000
- *
- * .org 0x40
- * .ascii "ECEC"
- *
- * .org 0x1000
- * --- Header end ---
- */
-
-#define CONFIG_SYS_TEXT_BASE 0xa0041000
-
-/*
- * Static chips
- */
-
-#define CONFIG_SYS_MSC0_VAL 0x246c7ffc
-#define CONFIG_SYS_MSC1_VAL 0x7ff07ff0
-#define CONFIG_SYS_MSC2_VAL 0x7ff07ff0
-
-/*
- * PCMCIA and CF Interfaces
- */
-
-#define CONFIG_SYS_MECR_VAL 0x00000000
-#define CONFIG_SYS_MCMEM0_VAL 0x00000000
-#define CONFIG_SYS_MCMEM1_VAL 0x00000000
-#define CONFIG_SYS_MCATT0_VAL 0x00000000
-#define CONFIG_SYS_MCATT1_VAL 0x00000000
-#define CONFIG_SYS_MCIO0_VAL 0x00000000
-#define CONFIG_SYS_MCIO1_VAL 0x00000000
-
-#define CONFIG_SYS_FLYCNFG_VAL 0x00000000
-#define CONFIG_SYS_SXCNFG_VAL 0x00040004
-
-#define CONFIG_SYS_MDREFR_VAL 0x0099E018
-#define CONFIG_SYS_MDCNFG_VAL 0x01C801CB
-#define CONFIG_SYS_MDMRS_VAL 0x00220022
-
-#define CONFIG_SYS_PSSR_VAL 0x00000000
-#define CONFIG_SYS_CKEN 0x00004840
-#define CONFIG_SYS_CCCR 0x00000161
-
-/*
- * GPIOs
- */
-
-#define CONFIG_SYS_GPSR0_VAL 0x01000000
-#define CONFIG_SYS_GPSR1_VAL 0x00000000
-#define CONFIG_SYS_GPSR2_VAL 0x00010000
-
-#define CONFIG_SYS_GPCR0_VAL 0x00000000
-#define CONFIG_SYS_GPCR1_VAL 0x00000000
-#define CONFIG_SYS_GPCR2_VAL 0x00000000
-
-#define CONFIG_SYS_GPDR0_VAL 0xF7E38C00
-#define CONFIG_SYS_GPDR1_VAL 0xBCFFBF83
-#define CONFIG_SYS_GPDR2_VAL 0x000157FF
-
-#define CONFIG_SYS_GAFR0_L_VAL 0x80401000
-#define CONFIG_SYS_GAFR0_U_VAL 0x00000112
-#define CONFIG_SYS_GAFR1_L_VAL 0x600A9550
-#define CONFIG_SYS_GAFR1_U_VAL 0x0005AAAA
-#define CONFIG_SYS_GAFR2_L_VAL 0x20000000
-#define CONFIG_SYS_GAFR2_U_VAL 0x00000000
-
-/*
- * Serial port
- */
-
-#define CONFIG_PXA_SERIAL
-#define CONFIG_FFUART
-#define CONFIG_CONS_INDEX 3
-
-#define CONFIG_BAUDRATE 115200
-#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 38400, 115200 }
-
-#define CONFIG_FIT_DISABLE_SHA256
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_INITRD_TAG
-
-/* Monitor Command Prompt */
-
-/* Console I/O Buffer Size */
-#define CONFIG_SYS_CBSIZE 256
-
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
-
-#define CONFIG_BOOTARGS "root=/dev/ram0 ro console=ttyS0,115200n8"
-
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-#define CONFIG_USB_DEV_PULLUP_GPIO 33
-/* USB VBUS GPIO 3 */
-
-#define CONFIG_BOOTCOMMAND \
- "setenv downloaded 0 ; while test $downloaded -eq 0 ; do " \
- "if bootp ; then setenv downloaded 1 ; fi ; done ; " \
- "source :script ; " \
- "bootm ; "
-
-#define CONFIG_USB_GADGET_PXA2XX
-#define CONFIG_USB_ETHER
-#define CONFIG_USB_ETH_SUBSET
-
-#define CONFIG_USBNET_DEV_ADDR "de:ad:be:ef:00:01"
-#define CONFIG_USBNET_HOST_ADDR "de:ad:be:ef:00:02"
-#define CONFIG_EXTRA_ENV_SETTINGS \
- "stdin=serial\0" \
- "stdout=serial\0" \
- "stderr=serial\0"
-
-#endif /* __CONFIG_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 04e9536..2c10c0b 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -373,7 +373,6 @@ CONFIG_BOARD_EARLY_INIT_F
CONFIG_BOARD_EARLY_INIT_R
CONFIG_BOARD_ECC_SUPPORT
CONFIG_BOARD_EMAC_COUNT
-CONFIG_BOARD_H2200
CONFIG_BOARD_IS_OPENRD_BASE
CONFIG_BOARD_IS_OPENRD_CLIENT
CONFIG_BOARD_IS_OPENRD_ULTIMATE
--
2.8.0.rc3.226.g39d4020