Remove ChromeOS specific configs from the U-Boot repository.
These configs now live in a separate repository
(u-boot-config.git) to reduce the patch load that we are
maintaining. The config repository was created from the
u-boot-next repository using:
git filter-branch --subdirectory-filter include/configs/chromeos
This creates a repository of just the changes in that directory,
preserving the commit history. The include/configs/tegra*.h config
files remain and are what are upstream.
Change-Id: I07176233be778bd6eb05733031643672b7b2ddd8
BUG=None
TEST=run "MAKEALL chromeos" without error.
Additionally, I ran the following for Seaboad and Kaen
emerge-tegra2_<board> -auDN --selective=n chromeos-u-boot-next
cros_write_firmware --board tegra2_<board> --firmware /build/tegra2_<board>/u-boot/u-boot-recovery.bin --sign
Verify system boots.
This CL depends on: http://codereview.chromium.org/6756038/
Review URL: http://codereview.chromium.org/6731090
diff --git a/config.mk b/config.mk
index dc26b7c..486a322 100644
--- a/config.mk
+++ b/config.mk
@@ -46,6 +46,10 @@
#########################################################################
+ifdef CROS_CONFIG_PATH
+HOSTCPPFLAGS += -I$(CROS_CONFIG_PATH)
+endif
+
HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer \
$(HOSTCPPFLAGS)
HOSTSTRIP = strip
@@ -185,6 +189,10 @@
CPPFLAGS += -DVBOOT_DEBUG
endif
+ifdef CROS_CONFIG_PATH
+CPPFLAGS += -I$(CROS_CONFIG_PATH)
+endif
+
CPPFLAGS += -I$(TOPDIR)/include
CPPFLAGS += -fno-builtin -ffreestanding -nostdinc \
-isystem $(gccincdir) -pipe $(PLATFORM_CPPFLAGS)
diff --git a/include/configs/chromeos/MSM8x60/common.h b/include/configs/chromeos/MSM8x60/common.h
deleted file mode 100644
index c0dc3f7..0000000
--- a/include/configs/chromeos/MSM8x60/common.h
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * Copyright (c) 2009-2010, Code Aurora Forum. All rights reserved.
- *
- * (C) Copyright 2002-2005
- * Wolfgang Denk, DENX Software Engineering, <wd@denx.de>
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- * Marius Groeger <mgroeger@sysgo.de>
- * Gary Jennejohn <gj@denx.de>
- *
- * Configuation settings for the st1q board, based on the Qualcomm
- * MSM8x60 surf board.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#ifndef __CONFIGS_CHROMEOS_8660_COMMON_H
-#define __CONFIGS_CHROMEOS_8660_COMMON_H
-
-#define CPU_IS_MSM8x60
-
-#include <asm/arch/MSM8x60_reg.h>
-#include <asm-armv7Scorpion/armv7Scorpion.h>
-#include <config.h>
-
-#define CONFIG_CHROMEOS_HWID "ARM MSM8x60 TEST 1635"
-
-#define IO_READ32(addr) (*((volatile unsigned int *) (addr)))
-#define IO_WRITE32(addr, val) (*((volatile unsigned int *) (addr)) = ((unsigned int) (val)))
-#define IO_READ16(addr) (*((volatile unsigned short *) (addr)))
-#define IO_WRITE16(addr, val) (*((volatile unsigned short *) (addr)) = ((unsigned short) (val)))
-#define IO_READ8(addr) (*((volatile char *) (addr)))
-#define IO_WRITE8(addr, val) (*((volatile unsigned char *) (addr)) = ((unsigned char) (val)))
-
-/*
- * High Level Configuration Options
- * (easy to change)
- */
-
-#define CONFIG_STACK_BASE
-
-
-/*
- * Machine ID for FFA
- */
-#define LINUX_MACH_TYPE (0xf656b)
-
-#define CONFIG_SYS_HZ (32768) /* GPT Timer frequency */
-#define CONFIG_TCXO_HZ 19200000 /* TCX0 frequency */
-
-#undef CONFIG_SHOW_BOOT_PROGRESS
-
-#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS
-//#define CONFIG_INITRD_TAG
-
-/*
- * Enable to pass framebuffer info to kernel
- * but after implementing calc_fbsize() in lcdc.c
- */
-#define CONFIG_VIDEOFLB_ATAG_NOT_SUPPORTED
-
-#define ATAG_CORE_FLAGS 0x00000004
-#define ATAG_PAGE_SIZE 0x00001000
-#define ATAG_CORE_RDEV 0x000000FF
-#define CONFIG_MISC_INIT_R 1 /* call misc_init_r during start up */
-
-/* Warm boot related constants */
-#define CONFIG_WARMBOOT_TRUE 0xBAC4F00D
-#define CONFIG_WARMBOOT_FALSE 0x15FA15E2
-
-/*
- * Address where ATAGs are stored and where bootwedge used to be.
- * 2 words at ATAGs are overwritten by power collapse routine
- * in the kernel to cause a jump back to the
- * power collapse exit routine in the kernel.
- * These are restored back to their original values
- * after successful power collapse .
- */
-#define CONFIG_WARMBOOT_POWER_COLLAPSE_EXIT_ADDRESS PHYS_SDRAM_1
-
-/*
- * Size of malloc() pool
- */
-#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024)
-
-/* size in bytes reserved for initial data */
-#define CONFIG_SYS_GBL_DATA_SIZE 128
-
-/*
- * Stack space needed =
- * Stack + Global Data + 3 words abort stack
- * This is checked by linker script to define stack section
- */
-#define CONFIG_SYS_MAX_STACK_SPACE (CONFIG_STACKSIZE + \
- CONFIG_SYS_GBL_DATA_SIZE + 12)
-
-/*
- * Serial port Configuration
- */
-#undef CONFIG_SILENT_CONSOLE
-#define CFG_QC_SERIAL
-#define CONFIG_CONS_INDEX 0
-#define CONFIG_BAUDRATE 115200
-#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
-
-#define CONFIG_BOOTP_MASK CONFIG_BOOTP_DEFAULT
-
-#define CONFIG_CMD_SOURCE
-
-#define CONFIG_BOOTDELAY 0
-
-#define CONFIG_BOOTARGS "console=tty0 root=/dev/mmcblk1p3 rootwait init=/sbin/init pmem_kernel_ebi1_size=32M"
-
-#define CONFIG_BOOTCOMMAND \
- "if mmcinfo 1; then " \
- "if ext2load mmc 1:3 0x40200000 boot/boot_script.uimg; then "\
- "source 0x40200000; " \
- "elif ext2load mmc 1:3 0x40207fc0 boot/vmlinux.uimg; then " \
- "bootm 0x40207fc0; " \
- "fi; " \
- "elif mmcinfo 0; then " \
- "if ext2load mmc 0:3 0x40200000 boot/boot_script.uimg; then "\
- "source 0x40200000; " \
- "elif ext2load mmc 0:3 0x40207fc0 boot/vmlinux.uimg; then " \
- "bootm 0x40207fc0; " \
- "fi; " \
- "fi;"
-
-/*
- * Miscellaneous configurable options
- */
-#define CONFIG_SYS_NO_FLASH
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#define CONFIG_SYS_PROMPT "ChromeOS> "
-#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
-#define CONFIG_SYS_BARGSIZE 2048 /* Boot Argument Buffer Size */
-
-#define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x7FC0) /* default load address in EBI1 SDRAM */
-
-/*-----------------------------------------------------------------------
- * Stack sizes
- *
- * The stack sizes are set up in start.S using the settings below
- */
-#define CONFIG_STACKSIZE (128*1024) /* regular stack */
-#ifdef CONFIG_USE_IRQ
-#define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */
-#define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */
-#endif
-
-/*
- * SDRAM: Memory available for kernel: 510MB.
- */
-#define CONFIG_NR_DRAM_BANKS 1
-#define PHYS_SDRAM_1 0x40200000
-#define PHYS_SDRAM_1_SIZE 0x1FE00000 /* 510MB */
-
-#define CONFIG_ARM_DCC
-#define CONFIG_ARM_DCC_MULTI
-#define CONFIG_CPU_V7
-#define CONFIG_SERIAL_CONSOLE
-//#define CONFIG_DCC_CONSOLE
-
-/* Console setup */
-#if defined(CONFIG_SERIAL_CONSOLE)
- #define CONFIG_STDOUT "serial"
- #define CONFIG_STDERR "serial"
- #define CONFIG_STDIN "serial"
-#elif defined(CONFIG_DCC_CONSOLE)
- #define CONFIG_STDOUT "dcc"
- #define CONFIG_STDERR "dcc"
- #define CONFIG_STDIN "dcc"
-#else /* default */
- #define CONFIG_STDOUT "lcd"
- #define CONFIG_STDERR "lcd"
- #define CONFIG_STDIN "dcc"
-#endif
-
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-
-/*-----------------------------------------------------------------------
- * Shared Memory Location -
- */
-#define SMEM_START 0xE0100000
-#define SMEM_SIZE 0x00100000
-
-/*-----------------------------------------------------------------------
- * Physical Memory Map -
- * U-Boot code, data, stack, etc. reside in external RAM.
- */
-#define UBOOT_SDRAM_BASE 0x40100000 /* external ram */
-#define UBOOT_SDRAM_SIZE 0x00100000
-
-/* Memory Test */
-#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM_1
-#define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE)
-
-/* Environment */
-#define CONFIG_ENV_IS_NOWHERE
-#define CONFIG_ENV_SIZE 0x2000
-
-/* Boot parameter address - offset of 0x100 from base of first sdram region */
-#define CFG_QC_BOOT_PARAM_ADDR (PHYS_SDRAM_1 + 0x100)
-
-/*-----------------------------------------------------------------------
- * The qc_serial driver uses the register names below. Set UART_BASE
- * for the desired UART.
- */
-#define UART_BASE UART3_BASE
-
-/* MMC interface */
-#define CONFIG_GENERIC_MMC
-#define CONFIG_GENERIC_MMC_MULTI_BLOCK_READ
-#define CONFIG_QSD_SDCC
-
-/* Ethernet support */
-#define CONFIG_CMD_NET
-#define CONFIG_NET_MULTI
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_PING
-
-#define CONFIG_SMC911X
-#define CONFIG_SMC911X_16_BIT
-#define CONFIG_SMC911X_BASE 0x1B800000
-
-#endif /* __CONFIGS_CHROMEOS_8660_COMMON_H */
diff --git a/include/configs/chromeos/MSM8x60/fast.h b/include/configs/chromeos/MSM8x60/fast.h
deleted file mode 100644
index 8e8bab7..0000000
--- a/include/configs/chromeos/MSM8x60/fast.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2010, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#ifndef __CONFIGS_CHROMEOS_8660_FAST_H
-#define __CONFIGS_CHROMEOS_8660_FAST_H
-
-#include <configs/chromeos/8660/common.h>
-
-/*
- * What monitor functions should be included
- */
-#define CONFIG_CMD_AUTOSCRIPT /* Autoscript Support */
-#define CONFIG_CMD_BDI /* bdinfo */
-#define CONFIG_CMD_BOOTD /* bootd */
-#define CONFIG_CMD_CONSOLE /* coninfo */
-#define CONFIG_CMD_ECHO /* echo arguments */
-#define CONFIG_CMD_SAVEENV /* saveenv */
-#define CONFIG_CMD_FPGA /* FPGA configuration Support */
-#define CONFIG_CMD_IMI /* iminfo */
-#define CONFIG_CMD_ITEST /* Integer (and string) test */
-#define CONFIG_CMD_LOADB /* loadb */
-#define CONFIG_CMD_LOADS /* loads */
-#define CONFIG_CMD_MEMORY /* md mm nm mw cp cmp crc base loop mtest */
-#define CONFIG_CMD_MISC /* Misc functions like sleep etc*/
-#define CONFIG_CMD_RUN /* run command in env variable */
-#define CONFIG_CMD_SETGETDCR /* DCR support on 4xx */
-#define CONFIG_CMD_XIMG /* Load part of Multi Image */
-#define CONFIG_CMD_NAND
-#define CONFIG_CMD_RAMCONFIG
-#define CONFIG_CMD_GETTIME
-
-#endif //__CONFIGS_CHROMEOS_8660_FAST_H
diff --git a/include/configs/chromeos/MSM8x60/recovery.h b/include/configs/chromeos/MSM8x60/recovery.h
deleted file mode 100644
index 049be4c..0000000
--- a/include/configs/chromeos/MSM8x60/recovery.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (c) 2010, Code Aurora Forum. All rights reserved.
- * Copyright 2010, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#ifndef __CONFIGS_CHROMEOS_8660_RECOVERY_H
-#define __CONFIGS_CHROMEOS_8660_RECOVERY_H
-
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-
-/*
- * Configure the LCD for recovery mode.
- * LCDC framebuffer is at MM HEAP1 in SMI
- * Note: Update as memory map changes
- */
-//#define CONFIG_LCD
-//#define CONFIG_SYS_WHITE_ON_BLACK
-//#define CONFIG_MSM8X60_LCDC
-
-#define LCD_BPP LCD_COLOR24
-
-#ifdef CONFIG_MSM8X60_LCDC
-# define LCDC_FB_ADDR 0x02b00000
-# define LCDC_FB_SIZE 0x00400000
-
-/* 1024x600x24 @ 60 Hz */
-# define LCDC_vl_col 1024
-# define LCDC_vl_row 600
-# define LCDC_vl_sync_width 1024
-# define LCDC_vl_sync_height 600
-# define LCDC_vl_hbp 80
-# define LCDC_vl_hfp 20
-# define LCDC_vl_vbp 22
-# define LCDC_vl_vfp 1
-# define LCDC_vl_hsync_width 40
-# define LCDC_vl_vsync_width 3
-
-# define LCD_MD_VAL_MHZ 0x1CF969FF //74.17 MHZ
-# define LCD_NS_VAL_MHZ 0x86F81B49 //74.17 MHZ
-# define LCD_CLK_PCOM_MHZ 74250000
-#endif
-
-/*
- * MMC/SD card
- */
-#define CONFIG_MMC
-#define CONFIG_EFI_PARTITION
-//#define CONFIG_DOS_PARTITION
-
-#include <configs/chromeos/MSM8x60/common.h>
-
-/*
- * What monitor functions should be included
- */
-#define CONFIG_CMD_AUTOSCRIPT /* Autoscript Support */
-#define CONFIG_CMD_BDI /* bdinfo */
-#define CONFIG_CMD_BOOTD /* bootd */
-#define CONFIG_CMD_CONSOLE /* coninfo */
-#define CONFIG_CMD_ECHO /* echo arguments */
-#define CONFIG_CMD_SAVEENV /* saveenv */
-#define CONFIG_CMD_FPGA /* FPGA configuration Support */
-#define CONFIG_CMD_IMI /* iminfo */
-#define CONFIG_CMD_ITEST /* Integer (and string) test */
-#define CONFIG_CMD_LOADB /* loadb */
-#define CONFIG_CMD_LOADS /* loads */
-#define CONFIG_CMD_MEMORY /* md mm nm mw cp cmp crc base loop mtest */
-#define CONFIG_CMD_MISC /* Misc functions like sleep etc*/
-#define CONFIG_CMD_RUN /* run command in env variable */
-#define CONFIG_CMD_SETGETDCR /* DCR support on 4xx */
-#define CONFIG_CMD_XIMG /* Load part of Multi Image */
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_MMC
-#define CONFIG_CMD_EXT2
-
-
-#define CONFIG_CMD_RAMCONFIG
-#define CONFIG_CMD_GETTIME
-#define CONFIG_CMD_NPART
-
-#define CONFIG_DYNAMIC_INODE_SIZE
-
-#endif //__CONFIGS_CHROMEOS_8660_RECOVERY_H
diff --git a/include/configs/chromeos/MSM8x60/stub.h b/include/configs/chromeos/MSM8x60/stub.h
deleted file mode 100644
index b8f30d9..0000000
--- a/include/configs/chromeos/MSM8x60/stub.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2010, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#ifndef __CONFIGS_CHROMEOS_8660_STUB_H
-#define __CONFIGS_CHROMEOS_8660_STUB_H
-
-#include <configs/chromeos/8660/common.h>
-
-/*
- * What monitor functions should be included
- */
-#define CONFIG_CMD_AUTOSCRIPT /* Autoscript Support */
-#define CONFIG_CMD_BDI /* bdinfo */
-#define CONFIG_CMD_BOOTD /* bootd */
-#define CONFIG_CMD_CONSOLE /* coninfo */
-#define CONFIG_CMD_ECHO /* echo arguments */
-#define CONFIG_CMD_SAVEENV /* saveenv */
-#define CONFIG_CMD_FPGA /* FPGA configuration Support */
-#define CONFIG_CMD_IMI /* iminfo */
-#define CONFIG_CMD_ITEST /* Integer (and string) test */
-#define CONFIG_CMD_LOADB /* loadb */
-#define CONFIG_CMD_LOADS /* loads */
-#define CONFIG_CMD_MEMORY /* md mm nm mw cp cmp crc base loop mtest */
-#define CONFIG_CMD_MISC /* Misc functions like sleep etc*/
-#define CONFIG_CMD_RUN /* run command in env variable */
-#define CONFIG_CMD_SETGETDCR /* DCR support on 4xx */
-#define CONFIG_CMD_XIMG /* Load part of Multi Image */
-#define CONFIG_CMD_NAND
-#define CONFIG_CMD_RAMCONFIG
-#define CONFIG_CMD_GETTIME
-
-#endif //__CONFIGS_CHROMEOS_8660_STUB_H
diff --git a/include/configs/chromeos/common.h b/include/configs/chromeos/common.h
deleted file mode 100644
index 127fbf2..0000000
--- a/include/configs/chromeos/common.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_common_h__
-#define __configs_chromeos_common_h__
-
-#include <asm/sizes.h>
-#include <config.h>
-
-/*
- * QUOTE(m) will evaluate to a string version of the value of the macro m
- * passed in. The extra level of indirection here is to first evaluate the
- * macro m before applying the quoting operator.
- */
-#define QUOTE_(m) #m
-#define QUOTE(m) QUOTE_(m)
-
-#define CONFIG_CHROMEOS
-
-#define CONFIG_CMD_RUN
-#define CONFIG_CMD_SOURCE
-
-#define CONFIG_OF_LIBFDT 1
-/*
- * The early kernel mapping on ARM currently only maps from the base of DRAM
- * to the end of the kernel image. The kernel is loaded at DRAM base + 0x8000.
- * The early kernel pagetable uses DRAM base + 0x4000 to DRAM base + 0x8000,
- * so that leaves DRAM base to DRAM base + 0x4000 available.
- */
-#define CONFIG_SYS_BOOTMAPSZ 0x4000
-
-#define CONFIG_CMDLINE_TAG 1
-
-#define CONFIG_ENV_SIZE SZ_128K
-#define CONFIG_ENV_OVERWRITE 1
-
-#define CONFIG_SYS_MALLOC_LEN SZ_1M
-#define CONFIG_SYS_GBL_DATA_SIZE 128
-
-#define CONFIG_BAUDRATE 115200
-#define CONFIG_SYS_BAUDRATE_TABLE {4800, \
- 9600, \
- 19200, \
- 38400, \
- 57600, \
- 115200}
-
-#define CONFIG_SYS_PROMPT "CrOS> "
-
-#define CONFIG_EXTRA_ENV_SETTINGS \
- CONFIG_EXTRA_ENV_SETTINGS_ARCH \
- CONFIG_EXTRA_ENV_SETTINGS_BOARD \
- "platform_extras=" \
- CONFIG_PLATFORM_EXTRAS_ARCH " " \
- CONFIG_PLATFORM_EXTRAS_BOARD "\0"
-
-#define CONFIG_SYS_CBSIZE 512
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + \
- 64)
-#define CONFIG_SYS_MAXARGS 64
-#define CONFIG_SYS_BARGSIZE (CONFIG_SYS_CBSIZE)
-
-#endif /* __configs_chromeos_common_h__ */
diff --git a/include/configs/chromeos/developer.h b/include/configs/chromeos/developer.h
deleted file mode 100644
index 8038c75..0000000
--- a/include/configs/chromeos/developer.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_developer_h__
-#define __configs_chromeos_developer_h__
-
-#include <configs/chromeos/common.h>
-
-#define CONFIG_CMD_AUTOSCRIPT
-#define CONFIG_CMD_BDI
-#define CONFIG_CMD_BOOTD
-#define CONFIG_CMD_CONSOLE
-#define CONFIG_CMD_CROS
-#define CONFIG_CMD_CROS_BOOTSTUB
-#define CONFIG_CMD_CROS_NORMAL_FIRMWARE
-#define CONFIG_CMD_ECHO
-#define CONFIG_CMD_FPGA
-#define CONFIG_CMD_IMI
-#define CONFIG_CMD_ITEST
-#define CONFIG_CMD_LOADB
-#define CONFIG_CMD_LOADS
-#define CONFIG_CMD_READ
-#define CONFIG_CMD_MISC
-#define CONFIG_CMD_SETGETDCR
-#define CONFIG_CMD_XIMG
-
-#define CONFIG_MMC
-#define CONFIG_EFI_PARTITION
-#define CONFIG_DOS_PARTITION
-
-#define CONFIG_CMD_CROS_REC
-
-#define CONFIG_CHROMEOS_BMPBLK
-#define CONFIG_CMD_BMP
-#define CONFIG_LCD_BMP_RLE8
-#define CONFIG_LZMA
-
-#define CONFIG_CHROMEOS_FIRMWARE_STORAGE_RAM
-
-#define CONFIG_CMD_READ
-#define CONFIG_CMD_MMC
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
-
-#define CONFIG_CMD_MEMORY
-
-/*
- * The following make using the console nicer.
- */
-#define CONFIG_DISPLAY_CPUINFO 1
-
-#define CONFIG_SYS_LONGHELP 1
-#define CONFIG_CMDLINE_EDITING 1
-#define CONFIG_COMMAND_HISTORY 1
-#define CONFIG_AUTOCOMPLETE 1
-#define CONFIG_SYS_HUSH_PARSER 1
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-
-/*
- * Recovery, normal and stub configs define CONFIG_ENV_IS_NOWHERE, but this
- * developer config requires a saved environment. The developer header file
- * in include/config/chromeos/<arch>/developer.h should define where the
- * environment is, for example CONFIG_ENV_IS_IN_SPI_FLASH for SPI flash.
- * If a saved environment is not available for a particular architecture or
- * board, you can define CONFIG_ENV_IS_NOWHERE in that header file instead.
- */
-#define CONFIG_CMD_SAVEENV
-
-/* Enable USB Ethernet dongles */
-#define CONFIG_USB_HOST_ETHER
-#define CONFIG_USB_ETHER_ASIX
-#define CONFIG_USB_ETHER_SMSC95XX
-
-/*
- * Ethernet support
- */
-#define CONFIG_CMD_NET
-#define CONFIG_NET_MULTI
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_DHCP
-
-/*
- * BOOTP options
- */
-#define CONFIG_BOOTP_SUBNETMASK
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-#define CONFIG_BOOTP_BOOTPATH
-
-#define CONFIG_IPADDR 10.0.0.2
-#define CONFIG_SERVERIP 10.0.0.1
-#define CONFIG_BOOTFILE uImage
-
-/*
- * We decorate the nfsroot name so that multiple users / boards can easily
- * share an NFS server:
- * user - username, e.g. 'frank'
- * board - board, e.g. 'seaboard'
- * serial - serial number, e.g. '1234'
- */
-#define CONFIG_ROOTPATH "/export/nfsroot-${user}-${board}-${serial#}"
-
-
-
-#endif //__configs_chromeos_developer_h__
diff --git a/include/configs/chromeos/fast.h b/include/configs/chromeos/fast.h
deleted file mode 100644
index e0e7d28..0000000
--- a/include/configs/chromeos/fast.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2010, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#ifndef __configs_chromeos_fast_h__
-#define __configs_chromeos_fast_h__
-
-#include <configs/chromeos/common.h>
-
-#endif //__configs_chromeos_fast_h__
diff --git a/include/configs/chromeos/firmware_layout.h b/include/configs/chromeos/firmware_layout.h
deleted file mode 100644
index 6db3ac3..0000000
--- a/include/configs/chromeos/firmware_layout.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __FIRMWARE_LAYOUT_H__
-#define __FIRMWARE_LAYOUT_H__
-
-#define CONFIG_FIRMWARE_SIZE 0x00400000 /* 4 MB */
-
-/* -- Region: Read-only ----------------------------------------------------- */
-
-/* ---- Section: Read-only firmware ----------------------------------------- */
-
-#define CONFIG_OFFSET_RO_SECTION 0x00000000
-#define CONFIG_LENGTH_RO_SECTION 0x001f0000
-
-#define CONFIG_OFFSET_BOOT_STUB 0x00000000
-#define CONFIG_LENGTH_BOOT_STUB 0x000a0000
-
-#define CONFIG_OFFSET_RECOVERY 0x000a0000
-#define CONFIG_LENGTH_RECOVERY 0x00100000
-
-#define CONFIG_OFFSET_RO_DATA 0x001a0000
-#define CONFIG_LENGTH_RO_DATA 0x00010000
-
-#define CONFIG_OFFSET_FMAP 0x001a0000
-#define CONFIG_LENGTH_FMAP 0x00000400
-
-#define CONFIG_OFFSET_GBB 0x001b0000
-#define CONFIG_LENGTH_GBB 0x00040000
-
-/* ---- Section: Vital-product data (VPD) ----------------------------------- */
-
-#define CONFIG_OFFSET_RO_VPD 0x001f0000
-#define CONFIG_LENGTH_RO_VPD 0x00010000
-
-/* -- Region: Writable ------------------------------------------------------ */
-
-/* ---- Section: Rewritable slot A ------------------------------------------ */
-
-#define CONFIG_OFFSET_RW_SECTION_A 0x00200000
-#define CONFIG_LENGTH_RW_SECTION_A 0x000e0000
-
-#define CONFIG_OFFSET_VBLOCK_A 0x00200000
-#define CONFIG_LENGTH_VBLOCK_A 0x00010000
-
-#define CONFIG_OFFSET_FW_MAIN_A 0x00210000
-#define CONFIG_LENGTH_FW_MAIN_A 0x000d0000
-
-#define CONFIG_OFFSET_DATA_A 0x00200000
-#define CONFIG_LENGTH_DATA_A 0x00000000
-
-/* ---- Section: Rewritable slot B ------------------------------------------ */
-
-#define CONFIG_OFFSET_RW_SECTION_B 0x002e0000
-#define CONFIG_LENGTH_RW_SECTION_B 0x000e0000
-
-#define CONFIG_OFFSET_VBLOCK_B 0x002e0000
-#define CONFIG_LENGTH_VBLOCK_B 0x00010000
-
-#define CONFIG_OFFSET_FW_MAIN_B 0x002f0000
-#define CONFIG_LENGTH_FW_MAIN_B 0x000d0000
-
-#define CONFIG_OFFSET_DATA_B 0x002e0000
-#define CONFIG_LENGTH_DATA_B 0x00000000
-
-/* ---- Section: Rewritable VPD --------------------------------------------- */
-
-#define CONFIG_OFFSET_RW_VPD 0x003c0000
-#define CONFIG_LENGTH_RW_VPD 0x00010000
-
-/* ---- Section: Rewritable shared ------------------------------------------ */
-
-#define CONFIG_OFFSET_RW_SHARED 0x003d0000
-#define CONFIG_LENGTH_RW_SHARED 0x00030000
-
-#define CONFIG_OFFSET_DEV_CFG 0x003d0000
-#define CONFIG_LENGTH_DEV_CFG 0x00011000
-
-#define CONFIG_OFFSET_SHARED_DATA 0x003e1000
-#define CONFIG_LENGTH_SHARED_DATA 0x0001d000
-
-#define CONFIG_OFFSET_VBNVCONTEXT 0x003fe000
-#define CONFIG_LENGTH_VBNVCONTEXT 0x00001000
-
-/* where are the meanings of these documented? Add a comment/link here */
-#define CONFIG_OFFSET_ENV 0x003ff000
-#define CONFIG_LENGTH_ENV 0x00001000
-
-#endif /* __FIRMWARE_LAYOUT_H__ */
diff --git a/include/configs/chromeos/flasher.h b/include/configs/chromeos/flasher.h
deleted file mode 100644
index e482b0e..0000000
--- a/include/configs/chromeos/flasher.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_flasher_h__
-#define __configs_chromeos_flasher_h__
-
-#include <configs/chromeos/common.h>
-
-#define CONFIG_CMD_BDI
-#define CONFIG_CMD_CONSOLE
-#define CONFIG_CMD_ECHO
-#define CONFIG_CMD_MEMORY
-
-#define CONFIG_SYS_MEMTEST_START 0x0000
-#define CONFIG_SYS_MEMTEST_END 0x1000
-
-#define CONFIG_ENV_IS_NOWHERE
-
-#endif //__configs_chromeos_flasher_h__
diff --git a/include/configs/chromeos/normal.h b/include/configs/chromeos/normal.h
deleted file mode 100644
index 86c9b68..0000000
--- a/include/configs/chromeos/normal.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_normal_h__
-#define __configs_chromeos_normal_h__
-
-#include <configs/chromeos/common.h>
-
-#define CONFIG_ENV_IS_NOWHERE
-
-#define CONFIG_CMD_CROS_NORMAL_FIRMWARE
-
-#define CONFIG_BOOTCOMMAND "cros_normal_firmware"
-
-/* These are used for access EFI partition */
-#define CONFIG_MMC
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
-#define CONFIG_CMD_MMC
-#define CONFIG_CMD_FAT
-
-#endif //__configs_chromeos_normal_h__
diff --git a/include/configs/chromeos/qemu/recovery.h b/include/configs/chromeos/qemu/recovery.h
deleted file mode 100644
index e1206a2..0000000
--- a/include/configs/chromeos/qemu/recovery.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2010, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#ifndef __CONFIGS_CHROMEOS_QEMU_RECOVERY_H__
-#define __CONFIGS_CHROMEOS_QEMU_RECOVERY_H__
-
-#include <configs/chromeos/recovery.h>
-
-/* HACK: undef variables that will be defined by versatile.h */
-#undef CONFIG_ENV_SIZE
-#undef CONFIG_SYS_MALLOC_LEN
-#undef CONFIG_BAUDRATE
-#undef CONFIG_SYS_BAUDRATE_TABLE
-#undef CONFIG_SYS_LONGHELP
-#undef CONFIG_SYS_PROMPT
-#undef CONFIG_BOOTARGS
-#undef CONFIG_SYS_CBSIZE
-#undef CONFIG_SYS_PBSIZE
-#undef CONFIG_SYS_MAXARGS
-#undef CONFIG_SYS_BARGSIZE
-
-#include <configs/versatile.h>
-
-/* HACK: restore variables */
-#undef CONFIG_SYS_PROMPT
-#define CONFIG_SYS_PROMPT "CrOS> "
-
-/* HACK: prevent compile error */
-#define CONFIG_GENERIC_MMC
-#define CONFIG_GENERIC_MMC_MULTI_BLOCK_READ
-#undef CONFIG_DISPLAY_CPUINFO
-#undef CONFIG_DISPLAY_BOARDINFO
-
-#endif /* __CONFIGS_CHROMEOS_QEMU_RECOVERY_H__ */
diff --git a/include/configs/chromeos/qrdc/common.h b/include/configs/chromeos/qrdc/common.h
deleted file mode 100644
index 570ecfd..0000000
--- a/include/configs/chromeos/qrdc/common.h
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * Copyright (c) 2009-2010, Code Aurora Forum. All rights reserved.
- *
- * (C) Copyright 2002-2005
- * Wolfgang Denk, DENX Software Engineering, <wd@denx.de>
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- * Marius Groeger <mgroeger@sysgo.de>
- * Gary Jennejohn <gj@denx.de>
- *
- * Configuation settings for the QRDC board, based on the Qualcomm
- * MSM8x60 surf board.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#ifndef __CONFIGS_CHROMEOS_QRDC_COMMON_H
-#define __CONFIGS_CHROMEOS_QRDC_COMMON_H
-
-#define CPU_IS_MSM8x60
-
-#include <asm/arch/MSM8x60_reg.h>
-#include <asm-armv7Scorpion/armv7Scorpion.h>
-#include <config.h>
-
-#define CONFIG_CHROMEOS_HWID "ARM QRDC TEST 0689"
-
-#define IO_READ32(addr) (*((volatile unsigned int *) (addr)))
-#define IO_WRITE32(addr, val) (*((volatile unsigned int *) (addr)) = ((unsigned int) (val)))
-#define IO_READ16(addr) (*((volatile unsigned short *) (addr)))
-#define IO_WRITE16(addr, val) (*((volatile unsigned short *) (addr)) = ((unsigned short) (val)))
-#define IO_READ8(addr) (*((volatile char *) (addr)))
-#define IO_WRITE8(addr, val) (*((volatile unsigned char *) (addr)) = ((unsigned char) (val)))
-
-/*
- * High Level Configuration Options
- * (easy to change)
- */
-
-#define CONFIG_STACK_BASE
-
-
-/*
- * Undefine Machine ID if defined in common board files.
-* Redefine the Machine ID for QRDC Board
- */
-#ifdef LINUX_MACH_TYPE
-#undef LINUX_MACH_TYPE
-#endif /* LINUX_MACH_TYPE */
-
-#define LINUX_MACH_TYPE (3060)
-
-#define CONFIG_SYS_HZ (32768) /* GPT Timer frequency */
-#define CONFIG_TCXO_HZ 19200000 /* TCX0 frequency */
-
-#undef CONFIG_SHOW_BOOT_PROGRESS
-
-#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS
-//#define CONFIG_INITRD_TAG
-
-/*
- * Enable to pass framebuffer info to kernel
- * but after implementing calc_fbsize() in lcdc.c
- */
-#define CONFIG_VIDEOFLB_ATAG_NOT_SUPPORTED
-
-#define ATAG_CORE_FLAGS 0x00000004
-#define ATAG_PAGE_SIZE 0x00001000
-#define ATAG_CORE_RDEV 0x000000FF
-#define CONFIG_MISC_INIT_R 1 /* call misc_init_r during start up */
-
-/* Warm boot related constants */
-#define CONFIG_WARMBOOT_TRUE 0xBAC4F00D
-#define CONFIG_WARMBOOT_FALSE 0x15FA15E2
-
-/*
- * Address where ATAGs are stored and where bootwedge used to be.
- * 2 words at ATAGs are overwritten by power collapse routine
- * in the kernel to cause a jump back to the
- * power collapse exit routine in the kernel.
- * These are restored back to their original values
- * after successful power collapse .
- */
-#define CONFIG_WARMBOOT_POWER_COLLAPSE_EXIT_ADDRESS PHYS_SDRAM_1
-
-/*
- * Size of malloc() pool
- */
-#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024)
-
-/* size in bytes reserved for initial data */
-#define CONFIG_SYS_GBL_DATA_SIZE 128
-
-/*
- * Stack space needed =
- * Stack + Global Data + 3 words abort stack
- * This is checked by linker script to define stack section
- */
-#define CONFIG_SYS_MAX_STACK_SPACE (CONFIG_STACKSIZE + \
- CONFIG_SYS_GBL_DATA_SIZE + 12)
-
-/*
- * Serial port Configuration
- */
-#undef CONFIG_SILENT_CONSOLE
-#define CFG_QC_SERIAL
-#define CONFIG_CONS_INDEX 0
-#define CONFIG_BAUDRATE 115200
-#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
-
-#define CONFIG_BOOTP_MASK CONFIG_BOOTP_DEFAULT
-
-#define CONFIG_CMD_SOURCE
-
-#define CONFIG_BOOTDELAY 0
-
-#define CONFIG_BOOTARGS "console=tty0 root=/dev/mmcblk1p3 rootwait init=/sbin/init pmem_kernel_ebi1_size=32M"
-
-#define CONFIG_BOOTCOMMAND \
- "if mmcinfo 1; then " \
- "if ext2load mmc 1:3 0x40200000 boot/boot_script.uimg; then "\
- "source 0x40200000; " \
- "elif ext2load mmc 1:3 0x40207fc0 boot/vmlinux.uimg; then " \
- "bootm 0x40207fc0; " \
- "fi; " \
- "elif mmcinfo 0; then " \
- "if ext2load mmc 0:3 0x40200000 boot/boot_script.uimg; then "\
- "source 0x40200000; " \
- "elif ext2load mmc 0:3 0x40207fc0 boot/vmlinux.uimg; then " \
- "bootm 0x40207fc0; " \
- "fi; " \
- "fi;"
-
-/*
- * Miscellaneous configurable options
- */
-#define CONFIG_SYS_NO_FLASH
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#define CONFIG_SYS_PROMPT "ChromeOS> "
-#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
-#define CONFIG_SYS_BARGSIZE 2048 /* Boot Argument Buffer Size */
-
-#define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x7FC0) /* default load address in EBI1 SDRAM */
-
-/*-----------------------------------------------------------------------
- * Stack sizes
- *
- * The stack sizes are set up in start.S using the settings below
- */
-#define CONFIG_STACKSIZE (128*1024) /* regular stack */
-#ifdef CONFIG_USE_IRQ
-#define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */
-#define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */
-#endif
-
-/*
- * SDRAM: Memory available for kernel: 510MB.
- */
-#define CONFIG_NR_DRAM_BANKS 1
-#define PHYS_SDRAM_1 0x40200000
-#define PHYS_SDRAM_1_SIZE 0x1FE00000 /* 510MB */
-
-#define CONFIG_ARM_DCC
-#define CONFIG_ARM_DCC_MULTI
-#define CONFIG_CPU_V7
-#define CONFIG_SERIAL_CONSOLE
-//#define CONFIG_DCC_CONSOLE
-
-/* Console setup */
-#if defined(CONFIG_SERIAL_CONSOLE)
- #define CONFIG_STDOUT "serial"
- #define CONFIG_STDERR "serial"
- #define CONFIG_STDIN "serial"
-#elif defined(CONFIG_DCC_CONSOLE)
- #define CONFIG_STDOUT "dcc"
- #define CONFIG_STDERR "dcc"
- #define CONFIG_STDIN "dcc"
-#else /* default */
- #define CONFIG_STDOUT "lcd"
- #define CONFIG_STDERR "lcd"
- #define CONFIG_STDIN "dcc"
-#endif
-
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-
-/*-----------------------------------------------------------------------
- * Shared Memory Location -
- */
-#define SMEM_START 0xE0100000
-#define SMEM_SIZE 0x00100000
-
-/*-----------------------------------------------------------------------
- * Physical Memory Map -
- * U-Boot code, data, stack, etc. reside in external RAM.
- */
-#define UBOOT_SDRAM_BASE 0x40100000 /* external ram */
-#define UBOOT_SDRAM_SIZE 0x00100000
-
-/* Memory Test */
-#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM_1
-#define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE)
-
-/* Environment */
-#define CONFIG_ENV_IS_NOWHERE
-#define CONFIG_ENV_SIZE 0x2000
-
-/* Boot parameter address - offset of 0x100 from base of first sdram region */
-#define CFG_QC_BOOT_PARAM_ADDR (PHYS_SDRAM_1 + 0x100)
-
-/*-----------------------------------------------------------------------
- * The qc_serial driver uses the register names below. Set UART_BASE
- * for the desired UART.
- */
-#define UART_BASE UART3_BASE
-
-/* MMC interface */
-#define CONFIG_GENERIC_MMC
-#define CONFIG_GENERIC_MMC_MULTI_BLOCK_READ
-#define CONFIG_QSD_SDCC
-
-/* Ethernet support */
-#define CONFIG_CMD_NET
-#define CONFIG_NET_MULTI
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_PING
-
-#define CONFIG_SMC911X
-#define CONFIG_SMC911X_16_BIT
-#define CONFIG_SMC911X_BASE 0x1B800000
-
-#endif /* __CONFIGS_CHROMEOS_QRDC_COMMON_H */
diff --git a/include/configs/chromeos/qrdc/fast.h b/include/configs/chromeos/qrdc/fast.h
deleted file mode 100644
index e845222..0000000
--- a/include/configs/chromeos/qrdc/fast.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2010, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#ifndef __CONFIGS_CHROMEOS_QRDC_FAST_H
-#define __CONFIGS_CHROMEOS_QRDC_FAST_H
-
-#include <configs/chromeos/8660/common.h>
-
-/*
- * What monitor functions should be included
- */
-#define CONFIG_CMD_AUTOSCRIPT /* Autoscript Support */
-#define CONFIG_CMD_BDI /* bdinfo */
-#define CONFIG_CMD_BOOTD /* bootd */
-#define CONFIG_CMD_CONSOLE /* coninfo */
-#define CONFIG_CMD_ECHO /* echo arguments */
-#define CONFIG_CMD_SAVEENV /* saveenv */
-#define CONFIG_CMD_FPGA /* FPGA configuration Support */
-#define CONFIG_CMD_IMI /* iminfo */
-#define CONFIG_CMD_ITEST /* Integer (and string) test */
-#define CONFIG_CMD_LOADB /* loadb */
-#define CONFIG_CMD_LOADS /* loads */
-#define CONFIG_CMD_MEMORY /* md mm nm mw cp cmp crc base loop mtest */
-#define CONFIG_CMD_MISC /* Misc functions like sleep etc*/
-#define CONFIG_CMD_RUN /* run command in env variable */
-#define CONFIG_CMD_SETGETDCR /* DCR support on 4xx */
-#define CONFIG_CMD_XIMG /* Load part of Multi Image */
-#define CONFIG_CMD_NAND
-#define CONFIG_CMD_RAMCONFIG
-#define CONFIG_CMD_GETTIME
-
-#endif //__CONFIGS_CHROMEOS_QRDC_FAST_H
diff --git a/include/configs/chromeos/qrdc/recovery.h b/include/configs/chromeos/qrdc/recovery.h
deleted file mode 100644
index d12547e..0000000
--- a/include/configs/chromeos/qrdc/recovery.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (c) 2010, Code Aurora Forum. All rights reserved.
- * Copyright 2010, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#ifndef __CONFIGS_CHROMEOS_QRDC_RECOVERY_H
-#define __CONFIGS_CHROMEOS_QRDC_RECOVERY_H
-
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-
-/*
- * Configure the LCD for recovery mode.
- * LCDC framebuffer is at MM HEAP1 in SMI
- * Note: Update as memory map changes
- */
-//#define CONFIG_LCD
-//#define CONFIG_SYS_WHITE_ON_BLACK
-//#define CONFIG_MSM8X60_LCDC
-
-#define LCD_BPP LCD_COLOR24
-
-#ifdef CONFIG_MSM8X60_LCDC
-# define LCDC_FB_ADDR 0x02b00000
-# define LCDC_FB_SIZE 0x00400000
-
-/* 1024x600x24 @ 60 Hz */
-# define LCDC_vl_col 1024
-# define LCDC_vl_row 600
-# define LCDC_vl_sync_width 1024
-# define LCDC_vl_sync_height 600
-# define LCDC_vl_hbp 80
-# define LCDC_vl_hfp 20
-# define LCDC_vl_vbp 22
-# define LCDC_vl_vfp 1
-# define LCDC_vl_hsync_width 40
-# define LCDC_vl_vsync_width 3
-
-# define LCD_MD_VAL_MHZ 0x1CF969FF //74.17 MHZ
-# define LCD_NS_VAL_MHZ 0x86F81B49 //74.17 MHZ
-# define LCD_CLK_PCOM_MHZ 74250000
-#endif
-
-/*
- * MMC/SD card
- */
-#define CONFIG_MMC
-#define CONFIG_EFI_PARTITION
-//#define CONFIG_DOS_PARTITION
-
-#include <configs/chromeos/qrdc/common.h>
-
-/*
- * What monitor functions should be included
- */
-#define CONFIG_CMD_AUTOSCRIPT /* Autoscript Support */
-#define CONFIG_CMD_BDI /* bdinfo */
-#define CONFIG_CMD_BOOTD /* bootd */
-#define CONFIG_CMD_CONSOLE /* coninfo */
-#define CONFIG_CMD_ECHO /* echo arguments */
-#define CONFIG_CMD_SAVEENV /* saveenv */
-#define CONFIG_CMD_FPGA /* FPGA configuration Support */
-#define CONFIG_CMD_IMI /* iminfo */
-#define CONFIG_CMD_ITEST /* Integer (and string) test */
-#define CONFIG_CMD_LOADB /* loadb */
-#define CONFIG_CMD_LOADS /* loads */
-#define CONFIG_CMD_MEMORY /* md mm nm mw cp cmp crc base loop mtest */
-#define CONFIG_CMD_MISC /* Misc functions like sleep etc*/
-#define CONFIG_CMD_RUN /* run command in env variable */
-#define CONFIG_CMD_SETGETDCR /* DCR support on 4xx */
-#define CONFIG_CMD_XIMG /* Load part of Multi Image */
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_MMC
-#define CONFIG_CMD_EXT2
-
-
-#define CONFIG_CMD_RAMCONFIG
-#define CONFIG_CMD_GETTIME
-#define CONFIG_CMD_NPART
-
-#define CONFIG_DYNAMIC_INODE_SIZE
-
-#endif //__CONFIGS_CHROMEOS_QRDC_RECOVERY_H
diff --git a/include/configs/chromeos/qrdc/stub.h b/include/configs/chromeos/qrdc/stub.h
deleted file mode 100644
index c2c5781..0000000
--- a/include/configs/chromeos/qrdc/stub.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2010, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#ifndef __CONFIGS_CHROMEOS_QRDC_STUB_H
-#define __CONFIGS_CHROMEOS_QRDC_STUB_H
-
-#include <configs/chromeos/8660/common.h>
-
-/*
- * What monitor functions should be included
- */
-#define CONFIG_CMD_AUTOSCRIPT /* Autoscript Support */
-#define CONFIG_CMD_BDI /* bdinfo */
-#define CONFIG_CMD_BOOTD /* bootd */
-#define CONFIG_CMD_CONSOLE /* coninfo */
-#define CONFIG_CMD_ECHO /* echo arguments */
-#define CONFIG_CMD_SAVEENV /* saveenv */
-#define CONFIG_CMD_FPGA /* FPGA configuration Support */
-#define CONFIG_CMD_IMI /* iminfo */
-#define CONFIG_CMD_ITEST /* Integer (and string) test */
-#define CONFIG_CMD_LOADB /* loadb */
-#define CONFIG_CMD_LOADS /* loads */
-#define CONFIG_CMD_MEMORY /* md mm nm mw cp cmp crc base loop mtest */
-#define CONFIG_CMD_MISC /* Misc functions like sleep etc*/
-#define CONFIG_CMD_RUN /* run command in env variable */
-#define CONFIG_CMD_SETGETDCR /* DCR support on 4xx */
-#define CONFIG_CMD_XIMG /* Load part of Multi Image */
-#define CONFIG_CMD_NAND
-#define CONFIG_CMD_RAMCONFIG
-#define CONFIG_CMD_GETTIME
-
-#endif //__CONFIGS_CHROMEOS_QRDC_STUB_H
diff --git a/include/configs/chromeos/recovery.h b/include/configs/chromeos/recovery.h
deleted file mode 100644
index 3f0aaa0..0000000
--- a/include/configs/chromeos/recovery.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_recovery_h__
-#define __configs_chromeos_recovery_h__
-
-#include <configs/chromeos/common.h>
-
-#define CONFIG_CMD_AUTOSCRIPT
-#define CONFIG_CMD_BDI
-#define CONFIG_CMD_BOOTD
-#define CONFIG_CMD_CONSOLE
-#define CONFIG_CMD_ECHO
-#define CONFIG_CMD_FPGA
-#define CONFIG_CMD_IMI
-#define CONFIG_CMD_ITEST
-#define CONFIG_CMD_LOADB
-#define CONFIG_CMD_LOADS
-#define CONFIG_CMD_READ
-#define CONFIG_CMD_MISC
-#define CONFIG_CMD_SETGETDCR
-#define CONFIG_CMD_XIMG
-
-#define CONFIG_MMC
-#define CONFIG_EFI_PARTITION
-#define CONFIG_DOS_PARTITION
-
-#define CONFIG_CMD_CROS_REC
-
-#define CONFIG_CHROMEOS_BMPBLK
-#define CONFIG_CMD_BMP
-#define CONFIG_LCD_BMP_RLE8
-#define CONFIG_LZMA
-
-#define CONFIG_CMD_READ
-#define CONFIG_CMD_MMC
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
-
-#define CONFIG_USB_STOR_NO_RETRY
-
-#define CONFIG_ENV_IS_NOWHERE
-
-#endif //__configs_chromeos_recovery_h__
diff --git a/include/configs/chromeos/st15/common.h b/include/configs/chromeos/st15/common.h
deleted file mode 100644
index b2b9b1a..0000000
--- a/include/configs/chromeos/st15/common.h
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * Copyright (c) 2009-2010, Code Aurora Forum. All rights reserved.
- *
- * (C) Copyright 2002-2005
- * Wolfgang Denk, DENX Software Engineering, <wd@denx.de>
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- * Marius Groeger <mgroeger@sysgo.de>
- * Gary Jennejohn <gj@denx.de>
- *
- * Configuation settings for the st1q board, based on the Qualcomm
- * QSD8x50 surf board.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#ifndef __CONFIGS_CHROMEOS_ST15_COMMON_H
-#define __CONFIGS_CHROMEOS_ST15_COMMON_H
-
-#define CPU_IS_QSD8x50A
-
-#include <asm/arch/QSD8x50A_reg.h>
-#include <asm-armv7Scorpion/armv7Scorpion.h>
-#include <config.h>
-
-#define CONFIG_CHROMEOS_HWID "ARM ST15 TEST 7712"
-
-#define IO_READ32(addr) (*((volatile unsigned int *) (addr)))
-#define IO_WRITE32(addr, val) (*((volatile unsigned int *) (addr)) = ((unsigned int) (val)))
-#define IO_READ16(addr) (*((volatile unsigned short *) (addr)))
-#define IO_WRITE16(addr, val) (*((volatile unsigned short *) (addr)) = ((unsigned short) (val)))
-#define IO_READ8(addr) (*((volatile char *) (addr)))
-#define IO_WRITE8(addr, val) (*((volatile unsigned char *) (addr)) = ((unsigned char) (val)))
-
-/*
- * High Level Configuration Options
- * (easy to change)
- */
-
-#define CONFIG_STACK_BASE
-
-#define CONFIG_ARCH_CPU_INIT
-
-/*
- * Machine ID for ST1.5
- */
-#define LINUX_MACH_TYPE 2627
-
-#define CONFIG_SYS_HZ (32768) /* GPT Timer frequency */
-#define CONFIG_TCXO_HZ 19200000 /* TCX0 frequency */
-
-#undef CONFIG_SHOW_BOOT_PROGRESS
-
-#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-
-/*
- * Enable to pass framebuffer info to kernel
- * but after implementing calc_fbsize() in lcdc.c
- */
-#define CONFIG_VIDEOFLB_ATAG_NOT_SUPPORTED
-
-#define ATAG_CORE_FLAGS 0x00000001
-#define ATAG_PAGE_SIZE 0x00001000
-#define ATAG_CORE_RDEV 0x000000FF
-
-#define CONFIG_MISC_INIT_R 1 /* call misc_init_r during start up */
-
-/* Warm boot related constants */
-#define CONFIG_WARMBOOT_TRUE 0xBAC4F00D
-#define CONFIG_WARMBOOT_FALSE 0x15FA15E2
-
-/*
- * Address where ATAGs are stored and where bootwedge used to be.
- * 2 words at ATAGs are overwritten by power collapse routine
- * in the kernel to cause a jump back to the
- * power collapse exit routine in the kernel.
- * These are restored back to their original values
- * after successful power collapse .
- */
-#define CONFIG_WARMBOOT_POWER_COLLAPSE_EXIT_ADDRESS PHYS_SDRAM_1
-
-/*
- * Size of malloc() pool
- */
-#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024)
-
-/* size in bytes reserved for initial data */
-#define CONFIG_SYS_GBL_DATA_SIZE 128
-
-/*
- * Stack space needed =
- * Stack + Global Data + 3 words abort stack
- * This is checked by linker script to define stack section
- */
-#define CONFIG_SYS_MAX_STACK_SPACE (CONFIG_STACKSIZE + \
- CONFIG_SYS_GBL_DATA_SIZE + 12)
-
-/*
- * Serial port Configuration
- */
-#undef CONFIG_SILENT_CONSOLE
-#define CFG_QC_SERIAL
-#define CONFIG_CONS_INDEX 0
-#define CONFIG_BAUDRATE 115200
-#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
-
-#define CONFIG_BOOTP_MASK CONFIG_BOOTP_DEFAULT
-
-#define CONFIG_CMD_SOURCE
-
-#define CONFIG_BOOTDELAY 0
-
-#define CONFIG_BOOTARGS "quiet root=/dev/mmcblk0p3 rootwait noresume noswap ro loglevel=1 pmem_kernel_ebi1_size=96M pmem_adsp_size=34200K"
-#define CONFIG_BOOTCOMMAND \
- "if mmcinfo 0; then " \
- "if ext2load mmc 0:3 0x00000000 boot/boot_script.uimg; then "\
- "source 0x00000000; " \
- "elif ext2load mmc 0:3 0x00007fc0 boot/vmlinux.uimg; then " \
- "bootm 0x00007fc0; " \
- "fi; " \
- "elif mmcinfo 1; then " \
- "if ext2load mmc 1:3 0x00000000 boot/boot_script.uimg; then "\
- "source 0x00000000; " \
- "elif ext2load mmc 1:3 0x00007fc0 boot/vmlinux.uimg; then " \
- "bootm 0x00007fc0; " \
- "fi; " \
- "fi;"
-
-/*
- * Miscellaneous configurable options
- */
-#define CONFIG_SYS_NO_FLASH
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#define CONFIG_SYS_PROMPT "ChromeOS> "
-#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
-#define CONFIG_SYS_BARGSIZE 2048 /* Boot Argument Buffer Size */
-
-#define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x7FC0) /* default load address in EBI1 SDRAM */
-
-/*-----------------------------------------------------------------------
- * Stack sizes
- *
- * The stack sizes are set up in start.S using the settings below
- */
-#define CONFIG_STACKSIZE (128*1024) /* regular stack */
-#ifdef CONFIG_USE_IRQ
-#define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */
-#define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */
-#endif
-
-/*
- * SDRAM is split into 2 regions to accommodate ADSP as a memory hole.
- * Memory available for kernel: 224 + 768 = 992MB.
- */
-#define CONFIG_NR_DRAM_BANKS 2
-#define PHYS_SDRAM_1 0x00000000 /* EBI1 start */
-#define PHYS_SDRAM_1_SIZE 0x0E000000 /* 256 - 32(adsp) = 224MB (0x0E000000)*/
-#define PHYS_SDRAM_2 0x10000000 /* EBI1, AFTER ADSP */
-#define PHYS_SDRAM_2_SIZE 0x30000000 /* 768MB */
-
-#define CONFIG_ARM_DCC
-#define CONFIG_ARM_DCC_MULTI
-#define CONFIG_CPU_V7
-
-/* Console setup */
-#if defined(CONFIG_SERIAL_CONSOLE)
- #define CONFIG_STDOUT "serial"
- #define CONFIG_STDERR "serial"
- #define CONFIG_STDIN "serial"
-#elif defined(CONFIG_DCC_CONSOLE)
- #define CONFIG_STDOUT "dcc"
- #define CONFIG_STDERR "dcc"
- #define CONFIG_STDIN "dcc"
-#else /* default */
- #define CONFIG_STDOUT "lcd"
- #define CONFIG_STDERR "lcd"
- #define CONFIG_STDIN "dcc"
-#endif
-
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-
-/*-----------------------------------------------------------------------
- * Shared Memory Location -
- */
-#define SMEM_START 0xE0100000
-#define SMEM_SIZE 0x00100000
-
-/*-----------------------------------------------------------------------
- * Physical Memory Map -
- * U-Boot code, data, stack, etc. reside in SMI SDRAM 0x00000000-0x000FFFFF.
- * There are similar parameters in the u-boot.lds linker script which also
- * need to be updated.
- */
-#define UBOOT_SDRAM_BASE 0xE0000000 /* SMI */
-#define UBOOT_SDRAM_SIZE 0x00100000
-
-/* Memory Test */
-#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM_1
-#define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE)
-
-/* Environment */
-#define CONFIG_ENV_IS_NOWHERE
-#define CONFIG_ENV_SIZE 0x2000
-
-/* Boot parameter address - offset of 0x100 from base of first sdram region */
-#define CFG_QC_BOOT_PARAM_ADDR (PHYS_SDRAM_1 + 0x100)
-
-/*-----------------------------------------------------------------------
- * The qc_serial driver uses the register names below. Set UART_BASE
- * for the desired UART.
- */
-#define UART_BASE UART3_BASE
-
-/* MMC interface */
-#define CONFIG_GENERIC_MMC
-#define CONFIG_GENERIC_MMC_MULTI_BLOCK_READ
-#define CONFIG_QSD_SDCC
-
-
-#ifndef CONFIG_GENERIC_MMC
-/* This section regarding legacy mmc will be removed once the new
- * mmc framework has been verified/tested sufficiently. If there are
- * any major issues, you could go back to the legacy mmc by undefining
- * the generic mmc code.
- */
-
-/*-----------------------------------------------------------------------
- * Choose the SD controller to use. SDC1, 2, 3, or 4.
- */
-#define SDC_INSTANCE 1
-#define USE_DM
-#define USE_HIGH_SPEED_MODE
-#define USE_4_BIT_BUS_MODE
-#define CONFIG_SYS_MMC_BASE 0xF0000000 // not used, but defined to prevent compile error
-#define PROC_COMM_VREG_SDC PM_VREG_WLAN_ID
-#endif
-
-/*-----------------------------------------------------------------------
- * NAND configuration
- */
-#define CONFIG_USE_ACCELERATED_PAGE_READ
-
-#define CONFIG_SYS_MAX_NAND_DEVICE 1
-#define CONFIG_SYS_NAND_BASE 0xF0000000 // not used, but defined to prevent compile error
-
-// NAND device specific register values for the NAND controller
-// These values are for the Samsung MFG=0xEC DEV=0xAA device (x8, 1.65~1.95V, 2K page)
-// NAND_DEVn_CFG0 and 1 registers. These parameters are are used for page r/w
-#define CONFIG_QC_NAND_NAND_DEVn_CFG0_VAL 0xAAD400C0
-#define CONFIG_QC_NAND_NAND_DEVn_CFG1_VAL 0x0004745C
-
-// NAND_DEVn_CFG0 and 1 registers. These parameters are are used for READ ID command
-#define CONFIG_QC_NAND_NAND_DEVn_CFG0_RD_ID_VAL 0xA2D40000;
-#define CONFIG_QC_NAND_NAND_DEVn_CFG1_RD_ID_VAL 0x0005019C;
-
-//Decide whether to use proc comm to communicate with modem
-//This will eventually go away.
-#define USE_PROC_COMM
-#define PROC_COMM_MPP_FOR_USB_VBUS PM_MPP_16
-#undef USE_PROC_COMM_USB_PHY_RESET /* proc_comm cmd to reset phy not working
- rt now, but eventually it will*/
-
-#endif /* __CONFIGS_CHROMEOS_ST15_COMMON_H */
diff --git a/include/configs/chromeos/st15/fast.h b/include/configs/chromeos/st15/fast.h
deleted file mode 100644
index 03e34eb..0000000
--- a/include/configs/chromeos/st15/fast.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2010, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#ifndef __CONFIGS_CHROMEOS_ST15_FAST_H
-#define __CONFIGS_CHROMEOS_ST15_FAST_H
-
-#include <configs/chromeos/st15/common.h>
-
-/*
- * What monitor functions should be included
- */
-#define CONFIG_CMD_AUTOSCRIPT /* Autoscript Support */
-#define CONFIG_CMD_BDI /* bdinfo */
-#define CONFIG_CMD_BOOTD /* bootd */
-#define CONFIG_CMD_CONSOLE /* coninfo */
-#define CONFIG_CMD_ECHO /* echo arguments */
-#define CONFIG_CMD_SAVEENV /* saveenv */
-#define CONFIG_CMD_FPGA /* FPGA configuration Support */
-#define CONFIG_CMD_IMI /* iminfo */
-#define CONFIG_CMD_ITEST /* Integer (and string) test */
-#define CONFIG_CMD_LOADB /* loadb */
-#define CONFIG_CMD_LOADS /* loads */
-#define CONFIG_CMD_MEMORY /* md mm nm mw cp cmp crc base loop mtest */
-#define CONFIG_CMD_MISC /* Misc functions like sleep etc*/
-#define CONFIG_CMD_RUN /* run command in env variable */
-#define CONFIG_CMD_SETGETDCR /* DCR support on 4xx */
-#define CONFIG_CMD_XIMG /* Load part of Multi Image */
-#define CONFIG_CMD_NAND
-#define CONFIG_CMD_RAMCONFIG
-#define CONFIG_CMD_GETTIME
-
-#endif //__CONFIGS_CHROMEOS_ST15_FAST_H
diff --git a/include/configs/chromeos/st15/recovery.h b/include/configs/chromeos/st15/recovery.h
deleted file mode 100644
index 1076e78..0000000
--- a/include/configs/chromeos/st15/recovery.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 2010, Code Aurora Forum. All rights reserved.
- * Copyright 2010, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#ifndef __CONFIGS_CHROMEOS_ST15_RECOVERY_H
-#define __CONFIGS_CHROMEOS_ST15_RECOVERY_H
-
-/*
- * Configure the LCD for recovery mode.
- * LCDC framebuffer is at MM HEAP1 in SMI
- * Note: Update as memory map changes
- */
-#define CONFIG_LCD
-#define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_QSD8X50_LCDC
-
-#define LCD_BPP LCD_COLOR24
-
-#ifdef CONFIG_QSD8X50_LCDC
-# define LCDC_FB_ADDR 0x02b00000
-# define LCDC_FB_SIZE 0x00400000
-
-/* 1366x768x24 @ 60 Hz */
-# define LCDC_vl_col 1366
-# define LCDC_vl_row 768
-# define LCDC_vl_sync_width 1366
-# define LCDC_vl_sync_height 768
-# define LCDC_vl_hbp 80
-# define LCDC_vl_hfp 20
-# define LCDC_vl_vbp 22
-# define LCDC_vl_vfp 1
-# define LCDC_vl_hsync_width 40
-# define LCDC_vl_vsync_width 3
-
-# define LCD_MD_VAL_MHZ 0x1CF969FF //74.17 MHZ
-# define LCD_NS_VAL_MHZ 0x86F81B49 //74.17 MHZ
-# define LCD_CLK_PCOM_MHZ 74250000
-#endif
-
-/*
- * MMC/SD card
- */
-#define CONFIG_MMC
-#define CONFIG_EFI_PARTITION
-
-#include <configs/chromeos/st15/common.h>
-
-/*
- * What monitor functions should be included
- */
-#define CONFIG_CMD_AUTOSCRIPT /* Autoscript Support */
-#define CONFIG_CMD_BDI /* bdinfo */
-#define CONFIG_CMD_BOOTD /* bootd */
-#define CONFIG_CMD_CONSOLE /* coninfo */
-#define CONFIG_CMD_ECHO /* echo arguments */
-#define CONFIG_CMD_SAVEENV /* saveenv */
-#define CONFIG_CMD_FPGA /* FPGA configuration Support */
-#define CONFIG_CMD_IMI /* iminfo */
-#define CONFIG_CMD_ITEST /* Integer (and string) test */
-#define CONFIG_CMD_LOADB /* loadb */
-#define CONFIG_CMD_LOADS /* loads */
-#define CONFIG_CMD_MEMORY /* md mm nm mw cp cmp crc base loop mtest */
-#define CONFIG_CMD_MISC /* Misc functions like sleep etc*/
-#define CONFIG_CMD_RUN /* run command in env variable */
-#define CONFIG_CMD_SETGETDCR /* DCR support on 4xx */
-#define CONFIG_CMD_XIMG /* Load part of Multi Image */
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_MMC
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_EXT2
-
-#define CONFIG_CMD_BMP
-
-#define CONFIG_CMD_NAND
-#define CONFIG_CMD_RAMCONFIG
-#define CONFIG_CMD_GETTIME
-#define CONFIG_CMD_NPART
-
-#define CONFIG_DYNAMIC_INODE_SIZE
-
-#endif //__CONFIGS_CHROMEOS_ST15_RECOVERY_H
diff --git a/include/configs/chromeos/st15/stub.h b/include/configs/chromeos/st15/stub.h
deleted file mode 100644
index cd451f1..0000000
--- a/include/configs/chromeos/st15/stub.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2010, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#ifndef __CONFIGS_CHROMEOS_ST15_STUB_H
-#define __CONFIGS_CHROMEOS_ST15_STUB_H
-
-#include <configs/chromeos/st15/common.h>
-
-/*
- * What monitor functions should be included
- */
-#define CONFIG_CMD_AUTOSCRIPT /* Autoscript Support */
-#define CONFIG_CMD_BDI /* bdinfo */
-#define CONFIG_CMD_BOOTD /* bootd */
-#define CONFIG_CMD_CONSOLE /* coninfo */
-#define CONFIG_CMD_ECHO /* echo arguments */
-#define CONFIG_CMD_SAVEENV /* saveenv */
-#define CONFIG_CMD_FPGA /* FPGA configuration Support */
-#define CONFIG_CMD_IMI /* iminfo */
-#define CONFIG_CMD_ITEST /* Integer (and string) test */
-#define CONFIG_CMD_LOADB /* loadb */
-#define CONFIG_CMD_LOADS /* loads */
-#define CONFIG_CMD_MEMORY /* md mm nm mw cp cmp crc base loop mtest */
-#define CONFIG_CMD_MISC /* Misc functions like sleep etc*/
-#define CONFIG_CMD_RUN /* run command in env variable */
-#define CONFIG_CMD_SETGETDCR /* DCR support on 4xx */
-#define CONFIG_CMD_XIMG /* Load part of Multi Image */
-#define CONFIG_CMD_NAND
-#define CONFIG_CMD_RAMCONFIG
-#define CONFIG_CMD_GETTIME
-
-#endif //__CONFIGS_CHROMEOS_ST15_STUB_H
diff --git a/include/configs/chromeos/st1q/common.h b/include/configs/chromeos/st1q/common.h
deleted file mode 100644
index c2dd9e3..0000000
--- a/include/configs/chromeos/st1q/common.h
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * Copyright (c) 2009, Code Aurora Forum. All rights reserved.
- *
- * (C) Copyright 2002-2005
- * Wolfgang Denk, DENX Software Engineering, <wd@denx.de>
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- * Marius Groeger <mgroeger@sysgo.de>
- * Gary Jennejohn <gj@denx.de>
- *
- * Configuation settings for the st1q board, based on the Qualcomm
- * QSD8x50 surf board.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#ifndef __CONFIGS_CHROMEOS_ST1Q_COMMON_H
-#define __CONFIGS_CHROMEOS_ST1Q_COMMON_H
-
-#include <asm/arch/QSD8x50_reg.h>
-#include <asm-armv7Scorpion/armv7Scorpion.h>
-#include <config.h>
-
-#define CONFIG_CHROMEOS_HWID "ARM ST1Q TEST 9468"
-
-#define IO_READ32(addr) (*((volatile unsigned int *) (addr)))
-#define IO_WRITE32(addr, val) (*((volatile unsigned int *) (addr)) = ((unsigned int) (val)))
-#define IO_READ16(addr) (*((volatile unsigned short *) (addr)))
-#define IO_WRITE16(addr, val) (*((volatile unsigned short *) (addr)) = ((unsigned short) (val)))
-#define IO_READ8(addr) (*((volatile char *) (addr)))
-#define IO_WRITE8(addr, val) (*((volatile unsigned char *) (addr)) = ((unsigned char) (val)))
-
-/*
- * High Level Configuration Options
- * (easy to change)
- */
-
-#define CONFIG_STACK_BASE
-
-#define CONFIG_ARCH_CPU_INIT
-
-/*
- * Machine ID for ST1
- */
-#define LINUX_MACH_TYPE 2508
-
-#define CONFIG_SYS_HZ (32768) /* GPT Timer frequency */
-#define CONFIG_TCXO_HZ 19200000 /* TCX0 frequency */
-
-#undef CONFIG_SHOW_BOOT_PROGRESS
-
-#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-
-/*
- * Enable to pass framebuffer info to kernel
- * but after implementing calc_fbsize() in lcdc.c
- */
-#define CONFIG_VIDEOFLB_ATAG_NOT_SUPPORTED
-
-#define ATAG_CORE_FLAGS 0x00000001
-#define ATAG_PAGE_SIZE 0x00001000
-#define ATAG_CORE_RDEV 0x000000FF
-
-#define CONFIG_MISC_INIT_R 1 /* call misc_init_r during start up */
-
-/* Warm boot related constants */
-#define CONFIG_WARMBOOT_TRUE 0xBAC4F00D
-#define CONFIG_WARMBOOT_FALSE 0x15FA15E2
-
-/*
- * Address where ATAGs are stored and where bootwedge used to be.
- * 2 words at ATAGs are overwritten by power collapse routine
- * in the kernel to cause a jump back to the
- * power collapse exit routine in the kernel.
- * These are restored back to their original values
- * after successful power collapse .
- */
-#define CONFIG_WARMBOOT_POWER_COLLAPSE_EXIT_ADDRESS PHYS_SDRAM_1
-
-/*
- * Size of malloc() pool
- */
-#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024)
-
-/* size in bytes reserved for initial data */
-#define CONFIG_SYS_GBL_DATA_SIZE 128
-
-/*
- * Stack space needed =
- * Stack + Global Data + 3 words abort stack
- * This is checked by linker script to define stack section
- */
-#define CONFIG_SYS_MAX_STACK_SPACE (CONFIG_STACKSIZE + \
- CONFIG_SYS_GBL_DATA_SIZE + 12)
-
-/*
- * Serial port Configuration
- */
-#undef CONFIG_SILENT_CONSOLE
-#define CFG_QC_SERIAL
-#define CONFIG_CONS_INDEX 0
-#define CONFIG_BAUDRATE 115200
-#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
-
-#define CONFIG_BOOTP_MASK CONFIG_BOOTP_DEFAULT
-
-#define CONFIG_BOOTDELAY 0
-#define CONFIG_BOOTARGS "root=/dev/mmcblk0p3 rootwait noresume noswap ro console=ttyMSM2,115200"
-#define CONFIG_BOOTCOMMAND "if mmcinfo 0; then ext2load mmc 0:3 0x20007fc0 boot/vmlinux.uimg; bootm 0x20007fc0; fi;"
-
-/*
- * Miscellaneous configurable options
- */
-#define CONFIG_SYS_NO_FLASH
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#define CONFIG_SYS_PROMPT "ChromeOS> "
-#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
-#define CONFIG_SYS_BARGSIZE 2048 /* Boot Argument Buffer Size */
-
-#define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x7FC0) /* default load address in EBI1 SDRAM */
-
-/*-----------------------------------------------------------------------
- * Stack sizes
- *
- * The stack sizes are set up in start.S using the settings below
- */
-#define CONFIG_STACKSIZE (128*1024) /* regular stack */
-#ifdef CONFIG_USE_IRQ
-#define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */
-#define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */
-#endif
-
-/*
- * SDRAM is split into 2 regions
- * to accomodate ADSP as a memory hole.
- */
-#define CONFIG_NR_DRAM_BANKS 2
-#define PHYS_SDRAM_1 0x20000000 /* EBI1 start */
-#define PHYS_SDRAM_1_SIZE 0x0E000000 /* 256 - 32(adsp) = 224MB (0x0E000000)*/
-#define PHYS_SDRAM_2 0x30000000 /* EBI1, AFTER ADSP */
-#define PHYS_SDRAM_2_SIZE 0x30000000 /* For 1024MB on new memory map */
-
-/*
- * Use the serial console.
- */
-#define CONFIG_SERIAL_CONSOLE
-
-/* Console setup */
-#if defined(CONFIG_SERIAL_CONSOLE)
- #define CONFIG_STDOUT "serial"
- #define CONFIG_STDERR "serial"
- #define CONFIG_STDIN "serial"
-#else
- #define CONFIG_ARM_DCC
- #define CONFIG_ARM_DCC_MULTI
- #define CONFIG_CPU_V7
-
- #define CONFIG_STDOUT "dcc"
- #define CONFIG_STDERR "dcc"
- #define CONFIG_STDIN "dcc"
-#endif
-
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-
-/*-----------------------------------------------------------------------
- * Shared Memory Location -
- */
-#define SMEM_START 0x00100000
-#define SMEM_SIZE 0x00100000
-
-/*-----------------------------------------------------------------------
- * Physical Memory Map -
- * U-Boot code, data, stack, etc. reside in SMI SDRAM 0x00000000-0x000FFFFF.
- * There are similar parameters in the u-boot.lds linker script which also
- * need to be updated.
- */
-#define UBOOT_SDRAM_BASE 0x00000000 /* SMI */
-#define UBOOT_SDRAM_SIZE 0x00100000
-
-/* Memory Test */
-#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM_1
-#define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE)
-
-/* Environment */
-#define CONFIG_ENV_IS_NOWHERE
-#define CONFIG_ENV_SIZE 0x2000
-
-/* Boot parameter address - offset of 0x100 from base of first sdram region */
-#define CFG_QC_BOOT_PARAM_ADDR (PHYS_SDRAM_1 + 0x100)
-
-/*-----------------------------------------------------------------------
- * The qc_serial driver uses the register names below. Set UART_BASE
- * for the desired UART.
- */
-#define UART_BASE UART3_BASE
-
-#define CONFIG_GENERIC_MMC
-#define CONFIG_QSD_SDCC
-
-
-#ifndef CONFIG_GENERIC_MMC
-/* This section regarding legacy mmc will be removed once the new
- * mmc framework has been verified/tested sufficiently. If there are
- * any major issues, you could go back to the legacy mmc by undefining
- * the generic mmc code.
- */
-
-/*-----------------------------------------------------------------------
- * Choose the SD controller to use. SDC1, 2, 3, or 4.
- */
-#define SDC_INSTANCE 1
-#define USE_DM
-#define USE_HIGH_SPEED_MODE
-#define USE_4_BIT_BUS_MODE
-#define CONFIG_SYS_MMC_BASE 0xF0000000 // not used, but defined to prevent compile error
-#define PROC_COMM_VREG_SDC PM_VREG_GP6_ID
-#endif
-
-/*-----------------------------------------------------------------------
- * NAND configuration
- */
-#define CONFIG_USE_ACCELERATED_PAGE_READ
-
-#define CONFIG_SYS_MAX_NAND_DEVICE 1
-#define CONFIG_SYS_NAND_BASE 0xF0000000 // not used, but defined to prevent compile error
-
-// NAND device specific register values for the NAND controller
-// These values are for the Samsung MFG=0xEC DEV=0xAA device (x8, 1.65~1.95V, 2K page)
-// NAND_DEVn_CFG0 and 1 registers. These parameters are are used for page r/w
-#define CONFIG_QC_NAND_NAND_DEVn_CFG0_VAL 0xAAD400C0
-#define CONFIG_QC_NAND_NAND_DEVn_CFG1_VAL 0x0004745C
-
-// NAND_DEVn_CFG0 and 1 registers. These parameters are are used for READ ID command
-#define CONFIG_QC_NAND_NAND_DEVn_CFG0_RD_ID_VAL 0xA2D40000;
-#define CONFIG_QC_NAND_NAND_DEVn_CFG1_RD_ID_VAL 0x0005019C;
-
-//Decide whether to use proc comm to communicate with modem
-//This will eventually go away.
-#define USE_PROC_COMM
-#define PROC_COMM_MPP_FOR_USB_VBUS PM_MPP_16
-#undef USE_PROC_COMM_USB_PHY_RESET /* proc_comm cmd to reset phy not working
- rt now, but eventually it will*/
-
-#endif /* __CONFIGS_CHROMEOS_ST1Q_COMMON_H */
diff --git a/include/configs/chromeos/st1q/credit.txt b/include/configs/chromeos/st1q/credit.txt
deleted file mode 100644
index 0f03510..0000000
--- a/include/configs/chromeos/st1q/credit.txt
+++ /dev/null
@@ -1 +0,0 @@
-assign credit
diff --git a/include/configs/chromeos/st1q/fast.h b/include/configs/chromeos/st1q/fast.h
deleted file mode 100644
index f6bd69c..0000000
--- a/include/configs/chromeos/st1q/fast.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2010, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#ifndef __CONFIGS_CHROMEOS_ST1Q_FAST_H
-#define __CONFIGS_CHROMEOS_ST1Q_FAST_H
-
-#include <configs/chromeos/st1q/common.h>
-
-/*
- * What monitor functions should be included
- */
-#define CONFIG_CMD_AUTOSCRIPT /* Autoscript Support */
-#define CONFIG_CMD_BDI /* bdinfo */
-#define CONFIG_CMD_BOOTD /* bootd */
-#define CONFIG_CMD_CONSOLE /* coninfo */
-#define CONFIG_CMD_ECHO /* echo arguments */
-#define CONFIG_CMD_SAVEENV /* saveenv */
-#define CONFIG_CMD_FPGA /* FPGA configuration Support */
-#define CONFIG_CMD_IMI /* iminfo */
-#define CONFIG_CMD_ITEST /* Integer (and string) test */
-#define CONFIG_CMD_LOADB /* loadb */
-#define CONFIG_CMD_LOADS /* loads */
-#define CONFIG_CMD_MEMORY /* md mm nm mw cp cmp crc base loop mtest */
-#define CONFIG_CMD_MISC /* Misc functions like sleep etc*/
-#define CONFIG_CMD_RUN /* run command in env variable */
-#define CONFIG_CMD_SETGETDCR /* DCR support on 4xx */
-#define CONFIG_CMD_XIMG /* Load part of Multi Image */
-#define CONFIG_CMD_NAND
-#define CONFIG_CMD_RAMCONFIG
-#define CONFIG_CMD_GETTIME
-
-#endif //__CONFIGS_CHROMEOS_ST1Q_FAST_H
diff --git a/include/configs/chromeos/st1q/recovery.h b/include/configs/chromeos/st1q/recovery.h
deleted file mode 100644
index d3c1560..0000000
--- a/include/configs/chromeos/st1q/recovery.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2010, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#ifndef __CONFIGS_CHROMEOS_ST1Q_RECOVERY_H
-#define __CONFIGS_CHROMEOS_ST1Q_RECOVERY_H
-
-/*
- * Configure the LCD for recovery mode.
- * LCDC framebuffer is at MM HEAP1 in SMI
- * Note: Update as memory map changes
- */
-#define CONFIG_LCD
-#define CONFIG_QSD8X50_LCDC
-#define LCD_BPP LCD_COLOR24
-
-#ifdef CONFIG_QSD8X50_LCDC
-# define LCDC_FB_ADDR 0x2C600000
-# define LCDC_FB_SIZE 0x00300000
-
-/* 1280x720x24 @ 60 Hz */
-# define LCDC_vl_col 1280
-# define LCDC_vl_row 720
-# define LCDC_vl_sync_width 1280
-# define LCDC_vl_sync_height 720
-# define LCDC_vl_hbp 160
-# define LCDC_vl_hfp 24
-# define LCDC_vl_vbp 29
-# define LCDC_vl_vfp 3
-# define LCDC_vl_hsync_width 136
-# define LCDC_vl_vsync_width 6
-
-# define LCD_MD_VAL_MHZ 0x1CF969FF //74.17 MHZ
-# define LCD_NS_VAL_MHZ 0x86F81B49 //74.17 MHZ
-# define LCD_CLK_PCOM_MHZ 74250000
-#endif
-
-/*
- * MMC/SD card
- */
-#define CONFIG_MMC
-#define CONFIG_EFI_PARTITION
-
-#include <configs/chromeos/st1q/common.h>
-
-/*
- * What monitor functions should be included
- */
-#define CONFIG_CMD_AUTOSCRIPT /* Autoscript Support */
-#define CONFIG_CMD_BDI /* bdinfo */
-#define CONFIG_CMD_BOOTD /* bootd */
-#define CONFIG_CMD_CONSOLE /* coninfo */
-#define CONFIG_CMD_ECHO /* echo arguments */
-#define CONFIG_CMD_SAVEENV /* saveenv */
-#define CONFIG_CMD_FPGA /* FPGA configuration Support */
-#define CONFIG_CMD_IMI /* iminfo */
-#define CONFIG_CMD_ITEST /* Integer (and string) test */
-#define CONFIG_CMD_LOADB /* loadb */
-#define CONFIG_CMD_LOADS /* loads */
-#define CONFIG_CMD_MEMORY /* md mm nm mw cp cmp crc base loop mtest */
-#define CONFIG_CMD_MISC /* Misc functions like sleep etc*/
-#define CONFIG_CMD_RUN /* run command in env variable */
-#define CONFIG_CMD_SETGETDCR /* DCR support on 4xx */
-#define CONFIG_CMD_XIMG /* Load part of Multi Image */
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_MMC
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_BMP
-#define CONFIG_CMD_NAND
-#define CONFIG_CMD_RAMCONFIG
-#define CONFIG_CMD_GETTIME
-#define CONFIG_CMD_NPART
-
-#define CONFIG_DYNAMIC_INODE_SIZE
-
-#endif //__CONFIGS_CHROMEOS_ST1Q_RECOVERY_H
diff --git a/include/configs/chromeos/st1q/stub.h b/include/configs/chromeos/st1q/stub.h
deleted file mode 100644
index f34c8a2..0000000
--- a/include/configs/chromeos/st1q/stub.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2010, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#ifndef __CONFIGS_CHROMEOS_ST1Q_STUB_H
-#define __CONFIGS_CHROMEOS_ST1Q_STUB_H
-
-#include <configs/chromeos/st1q/common.h>
-
-/*
- * What monitor functions should be included
- */
-#define CONFIG_CMD_AUTOSCRIPT /* Autoscript Support */
-#define CONFIG_CMD_BDI /* bdinfo */
-#define CONFIG_CMD_BOOTD /* bootd */
-#define CONFIG_CMD_CONSOLE /* coninfo */
-#define CONFIG_CMD_ECHO /* echo arguments */
-#define CONFIG_CMD_SAVEENV /* saveenv */
-#define CONFIG_CMD_FPGA /* FPGA configuration Support */
-#define CONFIG_CMD_IMI /* iminfo */
-#define CONFIG_CMD_ITEST /* Integer (and string) test */
-#define CONFIG_CMD_LOADB /* loadb */
-#define CONFIG_CMD_LOADS /* loads */
-#define CONFIG_CMD_MEMORY /* md mm nm mw cp cmp crc base loop mtest */
-#define CONFIG_CMD_MISC /* Misc functions like sleep etc*/
-#define CONFIG_CMD_RUN /* run command in env variable */
-#define CONFIG_CMD_SETGETDCR /* DCR support on 4xx */
-#define CONFIG_CMD_XIMG /* Load part of Multi Image */
-#define CONFIG_CMD_NAND
-#define CONFIG_CMD_RAMCONFIG
-#define CONFIG_CMD_GETTIME
-
-#endif //__CONFIGS_CHROMEOS_ST1Q_STUB_H
diff --git a/include/configs/chromeos/stub.h b/include/configs/chromeos/stub.h
deleted file mode 100644
index 192bd69..0000000
--- a/include/configs/chromeos/stub.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_stub_h__
-#define __configs_chromeos_stub_h__
-
-#include <configs/chromeos/common.h>
-
-#define CONFIG_ENV_IS_NOWHERE
-
-#define CONFIG_CMD_CROS_BOOTSTUB
-
-#define CONFIG_BOOTCOMMAND "cros_bootstub"
-
-#endif //__configs_chromeos_stub_h__
diff --git a/include/configs/chromeos/tegra2/aebl/common.h b/include/configs/chromeos/tegra2/aebl/common.h
deleted file mode 100644
index bc3e3a0..0000000
--- a/include/configs/chromeos/tegra2/aebl/common.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_aebl_common_h__
-#define __configs_chromeos_tegra2_aebl_common_h__
-
-#include <configs/chromeos/tegra2/common.h>
-
-/* Use default firmware layout */
-#include <configs/chromeos/firmware_layout.h>
-
-#define LINUX_MACH_TYPE MACH_TYPE_AEBL
-#define CONFIG_SYS_BOARD_ODMDATA 0x300d8011 /* lp1, 1GB */
-
-#define CONFIG_SERIAL_MULTI 1
-#define CONFIG_TEGRA2_ENABLE_UARTB 1
-#define CONFIG_TEGRA2_KEYBOARD 1
-#define CONFIG_KEYBOARD 1
-
-#define CONFIG_CONSOLE_MUX 1
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV 1
-
-#define CONFIG_EXTRA_ENV_SETTINGS_BOARD \
- "stdin=serial,tegra-kbc\0" \
- "stdout=serial,lcd\0" \
- "stderr=serial,lcd\0"
-
-#define CONFIG_PLATFORM_EXTRAS_BOARD \
- "mem=384M@0M nvmem=128M@384M mem=512M@512M"
-
-#include <configs/chromeos/tegra2/aebl/parts/i2c.h>
-#include <configs/chromeos/tegra2/aebl/parts/keyboard.h>
-#include <configs/chromeos/tegra2/aebl/parts/lcd.h>
-#include <configs/chromeos/tegra2/aebl/parts/mmc.h>
-#include <configs/chromeos/tegra2/aebl/parts/pinmux.h>
-#include <configs/chromeos/tegra2/aebl/parts/spi.h>
-#include <configs/chromeos/tegra2/aebl/parts/uart.h>
-#include <configs/chromeos/tegra2/aebl/parts/tpm.h>
-
-#define CONFIG_CHROMEOS_HWID "ARM AEBL TEST 5789"
-
-#define CONFIG_CHROMEOS_FIRMWARE_STORAGE_SPI
-#define CONFIG_CHROMEOS_DEFAULT_FIRMWARE_STORAGE_SPI
-
-#endif /*__configs_chromeos_tegra2_aebl_common_h__*/
diff --git a/include/configs/chromeos/tegra2/aebl/developer.h b/include/configs/chromeos/tegra2/aebl/developer.h
deleted file mode 100644
index ba95de4..0000000
--- a/include/configs/chromeos/tegra2/aebl/developer.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_aebl_developer_h__
-#define __configs_chromeos_tegra2_aebl_developer_h__
-
-#include <configs/chromeos/tegra2/developer.h>
-#include <configs/chromeos/tegra2/aebl/common.h>
-
-#include <configs/chromeos/tegra2/aebl/parts/usb.h>
-
-#define CONFIG_CMD_CROS_TPM
-
-#endif /*__configs_chromeos_tegra2_aebl_developer_h__*/
diff --git a/include/configs/chromeos/tegra2/aebl/flasher.h b/include/configs/chromeos/tegra2/aebl/flasher.h
deleted file mode 100644
index a145a00..0000000
--- a/include/configs/chromeos/tegra2/aebl/flasher.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_aebl_flasher_h__
-#define __configs_chromeos_tegra2_aebl_flasher_h__
-
-#include <configs/chromeos/tegra2/flasher.h>
-#include <configs/chromeos/tegra2/aebl/common.h>
-
-#endif /*__configs_chromeos_tegra2_aebl_flasher_h__*/
diff --git a/include/configs/chromeos/tegra2/aebl/normal.h b/include/configs/chromeos/tegra2/aebl/normal.h
deleted file mode 100644
index 67e1e36..0000000
--- a/include/configs/chromeos/tegra2/aebl/normal.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_aebl_normal_h__
-#define __configs_chromeos_tegra2_aebl_normal_h__
-
-#include <configs/chromeos/tegra2/normal.h>
-#include <configs/chromeos/tegra2/aebl/common.h>
-
-#include <configs/chromeos/tegra2/aebl/parts/mmc.h>
-
-#endif /*__configs_chromeos_tegra2_aebl_normal_h__*/
diff --git a/include/configs/chromeos/tegra2/aebl/parts/i2c.h b/include/configs/chromeos/tegra2/aebl/parts/i2c.h
deleted file mode 100644
index d67535e..0000000
--- a/include/configs/chromeos/tegra2/aebl/parts/i2c.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2011, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#define CONFIG_I2CP_PIN_MUX 1
-#define CONFIG_I2C1_PIN_MUX 1
-#define CONFIG_I2C2_PIN_MUX 2
-#define CONFIG_I2C3_PIN_MUX 1
diff --git a/include/configs/chromeos/tegra2/aebl/parts/keyboard.h b/include/configs/chromeos/tegra2/aebl/parts/keyboard.h
deleted file mode 100644
index 7fd370d..0000000
--- a/include/configs/chromeos/tegra2/aebl/parts/keyboard.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#define CONFIG_TEGRA2_KBC_PLAIN_KEYCODES \
- 0, 0, 'w', 's', 'a', 'z', 0, KEY_FN, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- '5', '4', 'r', 'e', 'f', 'd', 'x', 0, \
- '7', '6', 't', 'h', 'g', 'v', 'c', ' ', \
- '9', '8', 'u', 'y', 'j', 'n', 'b', '\\', \
- '-', '0', 'o', 'i', 'l', 'k', ',', 'm', \
- 0, '=', ']', '\r', 0, 0, 0, 0, \
- 0, 0, 0, 0, KEY_SHIFT, KEY_SHIFT, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- '[', 'p', '\'', ';', '/', '.', 0, 0, \
- 0, 0, 0x08, '3', '2', 0, 0, 0, \
- 0, 0x7F, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 'q', 0, 0, '1', 0, \
- 0x1B, '`', 0, 0x09, 0, 0, 0, 0
-
-#define CONFIG_TEGRA2_KBC_SHIFT_KEYCODES \
- 0, 0, 'W', 'S', 'A', 'Z', 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- '%', '$', 'R', 'E', 'F', 'D', 'X', 0, \
- '&', '^', 'T', 'H', 'G', 'V', 'C', ' ', \
- '(', '*', 'U', 'Y', 'J', 'N', 'B', '|', \
- '_', ')', 'O', 'I', 'L', 'K', ',', 'M', \
- 0, '+', '}', '\r', 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- '{', 'P', '"', ':', '?', '>', 0, 0, \
- 0, 0, 0x08, '#', '@', 0, 0, 0, \
- 0, 0x7F, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 'Q', 0, 0, '!', 0, \
- 0x1B, '~', 0, 0x09, 0, 0, 0, 0
-
-#define CONFIG_TEGRA2_KBC_FUNCTION_KEYCODES \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- '7', 0, 0, 0, 0, 0, 0, 0, \
- '9', '8', '4', 0, '1', 0, 0, 0, \
- 0, '/', '6', '5', '3', '2', 0, '0', \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, '\'', 0, '-', '+', '.', 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, '?', 0, 0, 0
diff --git a/include/configs/chromeos/tegra2/aebl/parts/lcd.h b/include/configs/chromeos/tegra2/aebl/parts/lcd.h
deleted file mode 100644
index a1bc8c1..0000000
--- a/include/configs/chromeos/tegra2/aebl/parts/lcd.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#define CONFIG_LCD_vl_col 1366
-#define CONFIG_LCD_vl_row 768
-
-#define TEGRA_GPIO_INIT_LCD TEGRA_GPIO_INIT_LCD_CHROMEOS_1
-#define TEGRA_CLOCK_INIT_LCD TEGRA_CLOCK_INIT_LCD_CHROMEOS_1
-#define TEGRA_RESOURCE_LCD TEGRA_RESOURCE_LCD_CHROMEOS_1
-#define TEGRA_PANEL_MODE TEGRA_PANEL_MODE_CHROMEOS_1
diff --git a/include/configs/chromeos/tegra2/aebl/parts/mmc.h b/include/configs/chromeos/tegra2/aebl/parts/mmc.h
deleted file mode 100644
index 2b87f04..0000000
--- a/include/configs/chromeos/tegra2/aebl/parts/mmc.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2011, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-/* Define this if device is always on EMMC4 controller and no Card Detect pin */
-#define CONFIG_TEGRA2_EMMC4_ALWAYS_INSERTED 1
-#define CONFIG_TEGRA2_EMMC4_IS_HS 1 /* only HS parts used */
-
-#define MMC_DEV_INSTANCES 2
-#define NvEmmcx_0 NvEmmc4
-#define NvEmmcx_1 NvEmmc3
-#define NvEmmcx_2 0
-#define NvEmmcx_3 0
diff --git a/include/configs/chromeos/tegra2/aebl/parts/pinmux.h b/include/configs/chromeos/tegra2/aebl/parts/pinmux.h
deleted file mode 100644
index 528698d..0000000
--- a/include/configs/chromeos/tegra2/aebl/parts/pinmux.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#define CONFIG_TEGRA2_PINMUX \
- CONFIG_TEGRA2_PINMUX_DISPLAY_CROS_1
diff --git a/include/configs/chromeos/tegra2/aebl/parts/spi.h b/include/configs/chromeos/tegra2/aebl/parts/spi.h
deleted file mode 100644
index c0fab33..0000000
--- a/include/configs/chromeos/tegra2/aebl/parts/spi.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2011, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#define CONFIG_TEGRA2_SPI
-#define CONFIG_SPI_FLASH
-#define CONFIG_SPI_FLASH_WINBOND
-#define CONFIG_SPI_FLASH_SLOW_READ
-#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
-#define CONFIG_CMD_SPI
-#define CONFIG_CMD_SF
diff --git a/include/configs/chromeos/tegra2/aebl/parts/tpm.h b/include/configs/chromeos/tegra2/aebl/parts/tpm.h
deleted file mode 100644
index c3a6519..0000000
--- a/include/configs/chromeos/tegra2/aebl/parts/tpm.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-/* this macro enable tlcl stub to call real hardware functions */
-#define CONFIG_HARDWARE_TPM
-
-/* config for infineon prototype i2c tpm chip */
-#define CONFIG_INFINEON_TPM_I2C
-#define CONFIG_INFINEON_TPM_I2C_BUS 2
-
-/* auto detect all following chips selected below */
-#define CONFIG_TPM_SLB9635_I2C
-/* #define CONFIG_TPM_SLB9635_I2C_V03 */
-
-/* limit burst write to tpm chip on i2c */
-#define CONFIG_TPM_I2C_BURST_LIMITATION 3
diff --git a/include/configs/chromeos/tegra2/aebl/parts/uart.h b/include/configs/chromeos/tegra2/aebl/parts/uart.h
deleted file mode 100644
index 939efe3..0000000
--- a/include/configs/chromeos/tegra2/aebl/parts/uart.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2011, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#define CONFIG_SYS_NS16550_COM1 NV_ADDRESS_MAP_APB_UARTB_BASE
diff --git a/include/configs/chromeos/tegra2/aebl/parts/usb.h b/include/configs/chromeos/tegra2/aebl/parts/usb.h
deleted file mode 100644
index d7454ce..0000000
--- a/include/configs/chromeos/tegra2/aebl/parts/usb.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2011, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-/* To set base address of USB controller */
-#define NvUSBx_0 USB_EHCI_TEGRA_BASE_ADDR_USB3
-#define NvUSBx_1 USB_EHCI_TEGRA_BASE_ADDR_USB1
-#define NvUSBx_2 0
-#define NvUSBx_3 0
-
-/*
- * USB1 takes 3 ms to clear Port Reset bit after issuing a Port Reset.
- * The expected time is 2 ms. Please refer to page 28 of EHCI 1.0 specification.
- */
-#define CONFIG_USB_RESET_CLEARED_MS 3 * 1000
diff --git a/include/configs/chromeos/tegra2/aebl/recovery.h b/include/configs/chromeos/tegra2/aebl/recovery.h
deleted file mode 100644
index c8d83c1..0000000
--- a/include/configs/chromeos/tegra2/aebl/recovery.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_aebl_recovery_h__
-#define __configs_chromeos_tegra2_aebl_recovery_h__
-
-#include <configs/chromeos/tegra2/recovery.h>
-#include <configs/chromeos/tegra2/aebl/common.h>
-
-#define CONFIG_BOOTCOMMAND \
- "run usb0_boot ; " \
- "run usb1_boot ; " \
- "run mmc1_boot ; " \
- "run mmc0_boot"
-
-#include <configs/chromeos/tegra2/aebl/parts/usb.h>
-
-#endif /*__configs_chromeos_tegra2_aebl_recovery_h__*/
diff --git a/include/configs/chromeos/tegra2/aebl/stub.h b/include/configs/chromeos/tegra2/aebl/stub.h
deleted file mode 100644
index a761d0b..0000000
--- a/include/configs/chromeos/tegra2/aebl/stub.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_aebl_stub_h__
-#define __configs_chromeos_tegra2_aebl_stub_h__
-
-#include <configs/chromeos/tegra2/stub.h>
-#include <configs/chromeos/tegra2/aebl/common.h>
-
-#endif /*__configs_chromeos_tegra2_aebl_stub_h__*/
diff --git a/include/configs/chromeos/tegra2/common.h b/include/configs/chromeos/tegra2/common.h
deleted file mode 100644
index e2fc5eb..0000000
--- a/include/configs/chromeos/tegra2/common.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * (C) Copyright 2010
- * NVIDIA Corporation <www.nvidia.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#ifndef __configs_chromeos_tegra2_common_h__
-#define __configs_chromeos_tegra2_common_h__
-
-#include <configs/chromeos/common.h>
-#include <asm/arch/tegra2.h>
-
-/*
- * High Level Configuration Options
- */
-#define CONFIG_ARMCORTEXA9 1
-#define CONFIG_TEGRA2 1
-#define CONFIG_MACH_TEGRA_GENERIC 1
-#define CONFIG_L2_OFF 1
-
-#define CONFIG_ENABLE_CORTEXA9 1
-#undef TEGRA2_TRACE
-
-#undef CONFIG_USE_IRQ
-#define CONFIG_ARCH_CPU_INIT
-#define CONFIG_MISC_INIT_R
-#define CONFIG_SKIP_LOWLEVEL_INIT
-
-#define CONFIG_SYS_64BIT_STRTOUL 1
-#define CONFIG_SYS_64BIT_VSPRINTF 1
-
-/*
- * PllX Configuration
- */
-#define CONFIG_SYS_CPU_OSC_FREQUENCY 1000000 /* Set CPU clock to 1GHz */
-
-#define CONFIG_SYS_NO_FLASH
-
-/* Enable Warmboot code and lp0_vec */
-#define CONFIG_TEGRA2_LP0 1
-
-#ifdef CONFIG_TEGRA2_LP0
-#define TEGRA_LP0_DEFAULT_ADDR 0x1C406000
-#define TEGRA_LP0_SIZE 0x2000
-
-#define TEGRA_LP0_CMDLINE \
- "lp0_vec=" QUOTE(TEGRA_LP0_SIZE) "@" QUOTE(TEGRA_LP0_DEFAULT_ADDR) " "
-#else
-#define TEGRA_LP0_CMDLINE
-#endif
-
-/* Put kcrashmem at 32MB which is free */
-#define TEGRA_KCRASHMEM_DEFAULT_ADDR 0x02000000
-#define TEGRA_KCRASHMEM_SIZE 0x100000
-
-#define TEGRA_KCRASHMEM_CMDLINE "kcrashmem=" QUOTE(TEGRA_KCRASHMEM_SIZE) "@" \
- QUOTE(TEGRA_KCRASHMEM_DEFAULT_ADDR) \
-
-/* Add in our required kernel cmdline arguments */
-#define CONFIG_PLATFORM_EXTRAS_ARCH \
- TEGRA_LP0_CMDLINE \
- TEGRA_KCRASHMEM_CMDLINE
-
-#define CONFIG_BOOTDELAY 2 /* 2s to break to prompt */
-#define CONFIG_EXTRA_ENV_SETTINGS_ARCH_COMMON \
- "scriptaddr=0x408000\0" \
- "script_img=/u-boot/boot.scr.uimg\0" \
- "mmc0_boot=setenv devnum 0; run mmc_boot;\0" \
- "mmc1_boot=setenv devnum 1; run mmc_boot;\0" \
- "usb0_boot=usb start 0; run usb_boot;\0" \
- "usb1_boot=usb start 1; run usb_boot;\0" \
- "scr_boot=fatload ${devtype} ${devnum}:c ${scriptaddr} ${script_img};" \
- "source ${scriptaddr};" \
- "read ${devtype} ${devnum}:${kernelpart} ${scriptaddr} 0 10;" \
- "source ${scriptaddr};\0" \
- "mmc_boot=mmc init ${devnum};" \
- "setenv devtype mmc;" \
- "setenv devname mmcblk${devnum}p;" \
- "run scr_boot;\0" \
- "usb_boot=setenv devtype usb;" \
- "setenv devnum 0;" \
- "setenv devname sda;" \
- "run scr_boot;\0"
-
-#define CONFIG_SYS_LOAD_ADDR 0xA00800
-
-#define CONFIG_SYS_HZ 1000
-
-/*-----------------------------------------------------------------------
- * Stack sizes
- *
- * The stack sizes are set up in start.S using the settings below
- */
-#define CONFIG_STACKBASE (SZ_32M + SZ_8M)
-#define CONFIG_STACKSIZE SZ_128K
-
-#ifdef CONFIG_USE_IRQ
-#define CONFIG_STACKSIZE_IRQ SZ_4K
-#define CONFIG_STACKSIZE_FIQ SZ_4K
-#endif
-
-/*-----------------------------------------------------------------------
- * Physical Memory Map
- */
-#define CONFIG_NR_DRAM_BANKS 1
-#define PHYS_SDRAM_1 TEGRA2_SDRC_CS0
-#define PHYS_SDRAM_1_SIZE SZ_512M
-
-/*-----------------------------------------------------------------------
- * Common macros for constructing configurations. These are being used to
- * move configuration data out of the board C files and into the included
- * configuration files. The final goal is to move this configuration data
- * into a FDT blob.
- *
- * Tracker: http://code.google.com/p/chromium-os/issues/detail?id=11623
- */
-#define TEGRA_GPIO_INIT(_gpio, _state) { _gpio, _state },
-
-#define TEGRA_CLOCK(_name, _parent, _rate, _enabled) \
- { _name, _parent, _rate, _enabled },
-
-#define TEGRA_RESOURCE(_name, _start, _length) \
- { \
- .name = _name, \
- .start = _start, \
- .end = _start + _length - 1, \
- },
-
-#define TEGRA_PANEL(_name, _value) ._name = _value,
-
-/*-----------------------------------------------------------------------
- * Include component configurations.
- */
-
-#include <configs/chromeos/tegra2/parts/gpio.h>
-#include <configs/chromeos/tegra2/parts/i2c.h>
-#include <configs/chromeos/tegra2/parts/lcd.h>
-#include <configs/chromeos/tegra2/parts/mmc.h>
-#include <configs/chromeos/tegra2/parts/pinmux.h>
-#include <configs/chromeos/tegra2/parts/uart.h>
-
-#define CONFIG_DISPLAY_BOARDINFO 1
-
-/*-----------------------------------------------------------------------
- * Statically Allocated Buffers for Verified Boot
- */
-#define CONFIG_VB_SHARED_DATA_BLOB 0x10000000
-#define CONFIG_VB_SHARED_DATA_SIZE VB_SHARED_DATA_REC_SIZE
-
-/*
- * Kernel must be loaded to a fixed address because it is a part of the
- * verified boot security check.
- *
- * You have to make sure that memory range starting from CONFIG_LOADADDR
- * has at least CONFIG_MAX_KERNEL_SIZE free space available.
- */
-#define CONFIG_LOADADDR 0x00100000
-
-/* A sufficiently large buffer size for holding kernel image */
-#define CONFIG_MAX_KERNEL_SIZE 0x00800000
-
-#endif /*__configs_chromeos_tegra2_common_h__*/
diff --git a/include/configs/chromeos/tegra2/developer.h b/include/configs/chromeos/tegra2/developer.h
deleted file mode 100644
index becb47a..0000000
--- a/include/configs/chromeos/tegra2/developer.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_developer_h__
-#define __configs_chromeos_tegra2_developer_h__
-
-#include <configs/chromeos/developer.h>
-#include <configs/chromeos/tegra2/common.h>
-
-#include <configs/chromeos/tegra2/parts/nand.h>
-#include <configs/chromeos/tegra2/parts/usb.h>
-
-/*
- * We expect all Tegra2 machines to have SPI flash as defined by the
- * firmware_layout.h config file. The environment will go there.
- */
-#define CONFIG_ENV_IS_IN_SPI_FLASH 1
-
-#define CONFIG_ENV_SECT_SIZE CONFIG_LENGTH_ENV
-#define CONFIG_ENV_OFFSET CONFIG_OFFSET_ENV
-
-/* Override the environment size, since we only need a small area */
-#undef CONFIG_ENV_SIZE
-#define CONFIG_ENV_SIZE CONFIG_LENGTH_ENV
-
-#define CONFIG_SYS_MEMTEST_START 0x0000
-#define CONFIG_SYS_MEMTEST_END 0x1000
-
-/*
- * Developer-friendly booting options:
- *
- * dhcp_boot: get IP address from DHCP, then boot with NFS root.
- * keynfs_boot: get kernel from USB stick ext2 partition 1, then NFS root.
- * usb_boot: boot from a USB image made with image_to_usb.sh.
- * mmc_boot: boot from an image installed in eMMC,
- *
- * regen_all sets up the bootargs, so must be run after any change to
- * environment variables.
- *
- * The network adapter must be available before starting an dhcp_boot. You
- * may need to use 'usb start' first if you are using a USB ethernet adapter.
- * The same applies for usb_boot.
- */
-
-#define CONFIG_EXTRA_ENV_SETTINGS_ARCH \
- "console=ttyS0,115200n8\0"\
- "cros_bootfile=/boot/vmlinux.uimg\0"\
- "user=user\0"\
- "board=arm\0"\
- "serial#=1\0"\
- "tftppath=/tftpboot/uImage\0"\
- "tftpserverip=10.0.0.1\0"\
- "nfsserverip=10.0.0.1\0"\
- "mmcdev=0\0"\
- "regen_all="\
- "setenv common_bootargs console=${console} "\
- "${platform_extras} noinitrd; "\
- "setenv bootargs ${common_bootargs} ${extra_bootargs} "\
- "${bootdev_bootargs}\0"\
- "regen_net_bootargs=setenv bootdev_bootargs "\
- "dev=/dev/nfs4 rw nfsroot=${nfsserverip}:${rootpath} "\
- "ip=dhcp; "\
- "run regen_all\0"\
- \
- "dhcp_setup=setenv tftppath "\
- "/tftpboot/uImage-${user}-${board}-${serial#}; "\
- "setenv rootpath " CONFIG_ROOTPATH "; "\
- "setenv autoload n; "\
- "run regen_net_bootargs\0"\
- "dhcp_boot=run dhcp_setup; "\
- "bootp; tftpboot ${loadaddr} ${tftpserverip}:${tftppath}; "\
- "bootm ${loadaddr}\0"\
- \
- "keynfs_setup="\
- "setenv rootpath " CONFIG_ROOTPATH "; "\
- "run regen_net_bootargs\0" \
- "keynfs_boot=run keynfs_setup; "\
- "ext2load usb 0:1 ${loadaddr} uImage; "\
- "bootm ${loadaddr}\0" \
- \
- "usb_setup=setenv bootdev_bootargs "\
- "root=/dev/sda3 rootwait; "\
- "run regen_all\0"\
- "usb_boot=run usb_setup; "\
- "ext2load usb 0:3 ${loadaddr} ${cros_bootfile}; "\
- "bootm ${loadaddr}\0" \
- \
- "mmc_setup=mmc init ${mmcdev}; setenv bootdev_bootargs "\
- "root=/dev/mmcblk0p3 rootwait; "\
- "run regen_all\0"\
- "mmc_boot=run mmc_setup; "\
- "ext2load mmc ${mmcdev}:3 ${loadaddr} ${cros_bootfile}; "\
- "bootm ${loadaddr}\0"
-
-/*
- * Our developer-friendly boot process tries a number of things in sequence
- * until it finds a kernel. Network booting is tried first if we have Ethernet.
- */
-#define CONFIG_BOOTCOMMAND \
- "usb start; "\
- "if test ${ethact} != \"\"; then "\
- "run dhcp_boot ; " \
- "fi ; " \
- "run keynfs_boot ; " \
- "run usb_boot ; " \
- "run mmc_boot"
-
-#endif //__configs_chromeos_tegra2_developer_h__
diff --git a/include/configs/chromeos/tegra2/flasher.h b/include/configs/chromeos/tegra2/flasher.h
deleted file mode 100644
index 6ce2096..0000000
--- a/include/configs/chromeos/tegra2/flasher.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_flasher_h__
-#define __configs_chromeos_tegra2_flasher_h__
-
-#include <configs/chromeos/flasher.h>
-#include <configs/chromeos/tegra2/common.h>
-
-#include <configs/chromeos/tegra2/parts/nand.h>
-
-#define SCRIPT_ADDRESS 0xe48000 // TEXT_BASE + 0x40000
-
-/*
- * Flasher is supposed to be loaded to fixed location, and so does not have
- * to able to relocate itself
- */
-#define CONFIG_SKIP_RELOCATE_UBOOT
-
-#define CONFIG_EXTRA_ENV_SETTINGS_ARCH CONFIG_EXTRA_ENV_SETTINGS_ARCH_COMMON
-#define CONFIG_BOOTCOMMAND "source " QUOTE(SCRIPT_ADDRESS)
-
-#endif //__configs_chromeos_tegra2_flasher_h__
diff --git a/include/configs/chromeos/tegra2/generic/common.h b/include/configs/chromeos/tegra2/generic/common.h
deleted file mode 100644
index f25745d..0000000
--- a/include/configs/chromeos/tegra2/generic/common.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_generic_common_h__
-#define __configs_chromeos_tegra2_generic_common_h__
-
-#include <configs/chromeos/tegra2/common.h>
-
-/* Use default firmware layout */
-#include <configs/chromeos/firmware_layout.h>
-
-#define LINUX_MACH_TYPE MACH_TYPE_HARMONY
-#define CONFIG_SYS_BOARD_ODMDATA 0x300d8011 /* lp1, 1GB */
-
-#define CONFIG_SERIAL_MULTI 1
-#define CONFIG_TEGRA2_ENABLE_UARTB 1
-
-#define CONFIG_CONSOLE_MUX 1
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV 1
-
-#define CONFIG_EXTRA_ENV_SETTINGS_BOARD \
- "stdin=serial\0" \
- "stdout=serial,lcd\0" \
- "stderr=serial,lcd\0"
-
-#define CONFIG_PLATFORM_EXTRAS_BOARD \
- "mem=384M@0M nvmem=128M@384M mem=512M@512M"
-
-#include <configs/chromeos/tegra2/generic/parts/i2c.h>
-#include <configs/chromeos/tegra2/generic/parts/lcd.h>
-#include <configs/chromeos/tegra2/generic/parts/mmc.h>
-#include <configs/chromeos/tegra2/generic/parts/pinmux.h>
-#include <configs/chromeos/tegra2/generic/parts/uart.h>
-
-#define CONFIG_CHROMEOS_HWID "ARM TEGRA2 GENERIC BOGUS 0000"
-
-#define CONFIG_CHROMEOS_FIRMWARE_STORAGE_NAND
-#define CONFIG_CHROMEOS_DEFAULT_FIRMWARE_STORAGE_NAND
-
-#endif /*__configs_chromeos_tegra2_generic_common_h__*/
diff --git a/include/configs/chromeos/tegra2/generic/developer.h b/include/configs/chromeos/tegra2/generic/developer.h
deleted file mode 100644
index d69f68f..0000000
--- a/include/configs/chromeos/tegra2/generic/developer.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_generic_developer_h__
-#define __configs_chromeos_tegra2_generic_developer_h__
-
-#include <configs/chromeos/tegra2/developer.h>
-#include <configs/chromeos/tegra2/generic/common.h>
-
-#include <configs/chromeos/tegra2/generic/parts/usb.h>
-
-/* We don't have environment support on the Generic build yet */
-#define CONFIG_ENV_IS_NOWHERE
-
-#endif /*__configs_chromeos_tegra2_generic_developer_h__*/
diff --git a/include/configs/chromeos/tegra2/generic/flasher.h b/include/configs/chromeos/tegra2/generic/flasher.h
deleted file mode 100644
index 03ce1e1..0000000
--- a/include/configs/chromeos/tegra2/generic/flasher.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_generic_flasher_h__
-#define __configs_chromeos_tegra2_generic_flasher_h__
-
-#include <configs/chromeos/tegra2/flasher.h>
-#include <configs/chromeos/tegra2/generic/common.h>
-
-#endif /*__configs_chromeos_tegra2_generic_flasher_h__*/
diff --git a/include/configs/chromeos/tegra2/generic/normal.h b/include/configs/chromeos/tegra2/generic/normal.h
deleted file mode 100644
index 90f7d1e..0000000
--- a/include/configs/chromeos/tegra2/generic/normal.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_generic_normal_h__
-#define __configs_chromeos_tegra2_generic_normal_h__
-
-#include <configs/chromeos/tegra2/normal.h>
-#include <configs/chromeos/tegra2/generic/common.h>
-
-#include <configs/chromeos/tegra2/generic/parts/mmc.h>
-
-#endif /*__configs_chromeos_tegra2_generic_normal_h__*/
diff --git a/include/configs/chromeos/tegra2/generic/parts/i2c.h b/include/configs/chromeos/tegra2/generic/parts/i2c.h
deleted file mode 100644
index e51d376..0000000
--- a/include/configs/chromeos/tegra2/generic/parts/i2c.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#define CONFIG_I2CP_PIN_MUX 1
-#define CONFIG_I2C1_PIN_MUX 1
-#define CONFIG_I2C2_PIN_MUX 2
-#define CONFIG_I2C3_PIN_MUX 1
diff --git a/include/configs/chromeos/tegra2/generic/parts/lcd.h b/include/configs/chromeos/tegra2/generic/parts/lcd.h
deleted file mode 100644
index 4965ef9..0000000
--- a/include/configs/chromeos/tegra2/generic/parts/lcd.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#define CONFIG_LCD_vl_col 1024
-#define CONFIG_LCD_vl_row 768
-
-#define TEGRA_GPIO_INIT_LCD TEGRA_GPIO_INIT_LCD_CHROMEOS_1
-#define TEGRA_CLOCK_INIT_LCD TEGRA_CLOCK_INIT_LCD_CHROMEOS_1
-#define TEGRA_RESOURCE_LCD TEGRA_RESOURCE_LCD_CHROMEOS_1
-#define TEGRA_PANEL_MODE TEGRA_PANEL_MODE_CHROMEOS_1
diff --git a/include/configs/chromeos/tegra2/generic/parts/mmc.h b/include/configs/chromeos/tegra2/generic/parts/mmc.h
deleted file mode 100644
index e582676..0000000
--- a/include/configs/chromeos/tegra2/generic/parts/mmc.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#define MMC_DEV_INSTANCES 0
-#define NvEmmcx_0 0
-#define NvEmmcx_1 0
-#define NvEmmcx_2 0
-#define NvEmmcx_3 0
diff --git a/include/configs/chromeos/tegra2/generic/parts/pinmux.h b/include/configs/chromeos/tegra2/generic/parts/pinmux.h
deleted file mode 100644
index 528698d..0000000
--- a/include/configs/chromeos/tegra2/generic/parts/pinmux.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#define CONFIG_TEGRA2_PINMUX \
- CONFIG_TEGRA2_PINMUX_DISPLAY_CROS_1
diff --git a/include/configs/chromeos/tegra2/generic/parts/uart.h b/include/configs/chromeos/tegra2/generic/parts/uart.h
deleted file mode 100644
index 680330b..0000000
--- a/include/configs/chromeos/tegra2/generic/parts/uart.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#define CONFIG_SYS_NS16550_COM1 NV_ADDRESS_MAP_APB_UARTB_BASE
diff --git a/include/configs/chromeos/tegra2/generic/parts/usb.h b/include/configs/chromeos/tegra2/generic/parts/usb.h
deleted file mode 100644
index e2b1573..0000000
--- a/include/configs/chromeos/tegra2/generic/parts/usb.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-/* To set base address of USB controller */
-#define NvUSBx_0 USB_EHCI_TEGRA_BASE_ADDR_USB3
-#define NvUSBx_1 USB_EHCI_TEGRA_BASE_ADDR_USB1
-#define NvUSBx_2 0
-#define NvUSBx_3 0
-
-/*
- * USB1 takes 3 ms to clear Port Reset bit after issuing a Port Reset.
- * The expected time is 2 ms. Please refer to page 28 of EHCI 1.0 specification.
- */
-#define CONFIG_USB_RESET_CLEARED_MS 3 * 1000
diff --git a/include/configs/chromeos/tegra2/generic/recovery.h b/include/configs/chromeos/tegra2/generic/recovery.h
deleted file mode 100644
index 5ec3fc6..0000000
--- a/include/configs/chromeos/tegra2/generic/recovery.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_generic_recovery_h__
-#define __configs_chromeos_tegra2_generic_recovery_h__
-
-#include <configs/chromeos/tegra2/recovery.h>
-#include <configs/chromeos/tegra2/generic/common.h>
-
-#define CONFIG_SYS_MEMTEST_START 0x0000
-#define CONFIG_SYS_MEMTEST_END 0x1000
-
-#include <configs/chromeos/tegra2/generic/parts/usb.h>
-
-#endif /*__configs_chromeos_tegra2_generic_recovery_h__*/
diff --git a/include/configs/chromeos/tegra2/generic/stub.h b/include/configs/chromeos/tegra2/generic/stub.h
deleted file mode 100644
index 310d9bb..0000000
--- a/include/configs/chromeos/tegra2/generic/stub.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_generic_stub_h__
-#define __configs_chromeos_tegra2_generic_stub_h__
-
-#include <configs/chromeos/tegra2/stub.h>
-#include <configs/chromeos/tegra2/generic/common.h>
-
-#endif /*__configs_chromeos_tegra2_generic_stub_h__*/
diff --git a/include/configs/chromeos/tegra2/harmony/common.h b/include/configs/chromeos/tegra2/harmony/common.h
deleted file mode 100644
index 9b9f5ba..0000000
--- a/include/configs/chromeos/tegra2/harmony/common.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_harmony_common_h__
-#define __configs_chromeos_tegra2_harmony_common_h__
-
-#include <configs/chromeos/tegra2/common.h>
-
-/* Use default firmware layout */
-#include <configs/chromeos/firmware_layout.h>
-
-#define LINUX_MACH_TYPE MACH_TYPE_HARMONY
-#define CONFIG_SYS_BOARD_ODMDATA 0x300d8011 /* lp1, 1GB */
-
-#define CONFIG_SERIAL_MULTI 1
-#define CONFIG_TEGRA2_ENABLE_UARTD 1
-#define CONFIG_TEGRA2_ENABLE_UARTA 0
-
-#define CONFIG_CONSOLE_MUX 1
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV 1
-
-#define CONFIG_EXTRA_ENV_SETTINGS_BOARD \
- "stdin=serial\0" \
- "stdout=serial,lcd\0" \
- "stderr=serial,lcd\0"
-
-#define CONFIG_PLATFORM_EXTRAS_BOARD \
- "mem=384M@0M nvmem=128M@384M mem=512M@512M"
-
-#include <configs/chromeos/tegra2/harmony/parts/i2c.h>
-#include <configs/chromeos/tegra2/harmony/parts/lcd.h>
-#include <configs/chromeos/tegra2/harmony/parts/mmc.h>
-#include <configs/chromeos/tegra2/harmony/parts/pinmux.h>
-#include <configs/chromeos/tegra2/harmony/parts/uart.h>
-
-#define CONFIG_CHROMEOS_HWID "ARM HARMONY TEST 2428"
-
-#define CONFIG_CHROMEOS_FIRMWARE_STORAGE_NAND
-#define CONFIG_CHROMEOS_DEFAULT_FIRMWARE_STORAGE_NAND
-
-#endif /*__configs_chromeos_tegra2_harmony_common_h__*/
diff --git a/include/configs/chromeos/tegra2/harmony/developer.h b/include/configs/chromeos/tegra2/harmony/developer.h
deleted file mode 100644
index 6173175..0000000
--- a/include/configs/chromeos/tegra2/harmony/developer.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_harmony_developer_h__
-#define __configs_chromeos_tegra2_harmony_developer_h__
-
-#include <configs/chromeos/tegra2/developer.h>
-#include <configs/chromeos/tegra2/harmony/common.h>
-
-#include <configs/chromeos/tegra2/harmony/parts/nand.h>
-#include <configs/chromeos/tegra2/harmony/parts/usb.h>
-
-/* We don't have environment support on Harmony yet */
-#define CONFIG_ENV_IS_NOWHERE
-
-#endif /*__configs_chromeos_tegra2_harmony_developer_h__*/
diff --git a/include/configs/chromeos/tegra2/harmony/flasher.h b/include/configs/chromeos/tegra2/harmony/flasher.h
deleted file mode 100644
index 12444bd..0000000
--- a/include/configs/chromeos/tegra2/harmony/flasher.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_harmony_flasher_h__
-#define __configs_chromeos_tegra2_harmony_flasher_h__
-
-#include <configs/chromeos/tegra2/flasher.h>
-#include <configs/chromeos/tegra2/harmony/common.h>
-
-#include <configs/chromeos/tegra2/harmony/parts/nand.h>
-
-#endif /*__configs_chromeos_tegra2_harmony_flasher_h__*/
diff --git a/include/configs/chromeos/tegra2/harmony/normal.h b/include/configs/chromeos/tegra2/harmony/normal.h
deleted file mode 100644
index 705dbf6..0000000
--- a/include/configs/chromeos/tegra2/harmony/normal.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_harmony_normal_h__
-#define __configs_chromeos_tegra2_harmony_normal_h__
-
-#include <configs/chromeos/tegra2/normal.h>
-#include <configs/chromeos/tegra2/harmony/common.h>
-
-#include <configs/chromeos/tegra2/harmony/parts/mmc.h>
-
-#endif /*__configs_chromeos_tegra2_harmony_normal_h__*/
diff --git a/include/configs/chromeos/tegra2/harmony/parts/i2c.h b/include/configs/chromeos/tegra2/harmony/parts/i2c.h
deleted file mode 100644
index 3e9d2e4..0000000
--- a/include/configs/chromeos/tegra2/harmony/parts/i2c.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2011, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#define CONFIG_I2CP_PIN_MUX 1
-#define CONFIG_I2C1_PIN_MUX 1
-#define CONFIG_I2C2_PIN_MUX 1
-#define CONFIG_I2C3_PIN_MUX 1
diff --git a/include/configs/chromeos/tegra2/harmony/parts/lcd.h b/include/configs/chromeos/tegra2/harmony/parts/lcd.h
deleted file mode 100644
index 20c86c2..0000000
--- a/include/configs/chromeos/tegra2/harmony/parts/lcd.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2011, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#define CONFIG_LCD_vl_col 1024
-#define CONFIG_LCD_vl_row 600
-
-#define TEGRA_GPIO_BACKLIGHT TEGRA_GPIO_PB5
-#define TEGRA_GPIO_LVDS_SHUTDOWN TEGRA_GPIO_PB2
-#define TEGRA_GPIO_BACKLIGHT_VDD TEGRA_GPIO_PW0
-#define TEGRA_GPIO_EN_VDD_PNL TEGRA_GPIO_PC6
-
-#define TEGRA_GPIO_INIT_LCD \
- TEGRA_GPIO_INIT(TEGRA_GPIO_BACKLIGHT, true) \
- TEGRA_GPIO_INIT(TEGRA_GPIO_LVDS_SHUTDOWN, true) \
- TEGRA_GPIO_INIT(TEGRA_GPIO_BACKLIGHT_VDD, false) \
- TEGRA_GPIO_INIT(TEGRA_GPIO_EN_VDD_PNL, true)
-
-#define TEGRA_CLOCK_INIT_LCD \
- TEGRA_CLOCK("host1x", "pll_p", 166000000, true) \
- TEGRA_CLOCK("disp1", "pll_p", 216000000, true) \
- TEGRA_CLOCK("2d", "pll_m", 266400000, true) \
- TEGRA_CLOCK("3d", "pll_m", 266400000, true) \
- TEGRA_CLOCK("pwm", "clk_32k", 32768, true)
-
-#define TEGRA_RESOURCE_LCD \
- TEGRA_RESOURCE("irq", 0x69, 1) \
- TEGRA_RESOURCE("regs", TEGRA_DISPLAY_BASE, TEGRA_DISPLAY_SIZE) \
- TEGRA_RESOURCE("fbmem", LCD_FB_ADDR, 0x4000000) \
- TEGRA_RESOURCE("pwm", TEGRA_PWFM0_BASE, TEGRA_PWFM0_SIZE)
-
-#define TEGRA_PANEL_MODE \
- TEGRA_PANEL(pclk, 79500000) \
- TEGRA_PANEL(h_ref_to_sync, 4) \
- TEGRA_PANEL(v_ref_to_sync, 2) \
- TEGRA_PANEL(h_sync_width, 136) \
- TEGRA_PANEL(v_sync_width, 4) \
- TEGRA_PANEL(h_back_porch, 138) \
- TEGRA_PANEL(v_back_porch, 21) \
- TEGRA_PANEL(h_front_porch, 34) \
- TEGRA_PANEL(v_front_porch, 4)
diff --git a/include/configs/chromeos/tegra2/harmony/parts/mmc.h b/include/configs/chromeos/tegra2/harmony/parts/mmc.h
deleted file mode 100644
index 19d0267..0000000
--- a/include/configs/chromeos/tegra2/harmony/parts/mmc.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2011, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#define MMC_DEV_INSTANCES 2
-#define NvEmmcx_0 NvEmmc4
-#define NvEmmcx_1 NvEmmc2
-#define NvEmmcx_2 0
-#define NvEmmcx_3 0
diff --git a/include/configs/chromeos/tegra2/harmony/parts/nand.h b/include/configs/chromeos/tegra2/harmony/parts/nand.h
deleted file mode 100644
index bfb96d0..0000000
--- a/include/configs/chromeos/tegra2/harmony/parts/nand.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * (C) Copyright 2010
- * NVIDIA Corporation <www.nvidia.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-/* Set clock divisor
- * 7 bits of D and 1 bit of H
- * divisor= (DDDDDDD + 1) + (H x 0.5)
- * clock = original clock / divisor
- * 6 means /4 */
-#define CONFIG_NAND_CLK_DIVISOR_DDDDDDDH 6
-
-/* For HYNIX HY27UF4G2B
- * Frequence output of PLLP_OUT0 is set by BOOTROM to 216MHz
- * to CLK_RST_CONTROLLER_PLLP_BASE_0,
- * 216MHz / divisor 4 = 54MHZ
- * 1 clock = 18.5 ns = NAND_CLK_PERIOD
- * TRP_RESP_CNT=n, max(tRP, tREA)= max(12ns, 20ns)= 20ns for non-EDO mode
- * bit 31-28=n=1, generated timing= (n+1) * NAND_CLK_PERIOD= (1+1)* 18.5
- * TWB_CNT bit 27-24=n, tWB = 100ns = (n+1)* 18.5, so n= 5 (bit 27-24)
- * similar way for other fields, please refer to reference manual
- */
-/* Value to be set to NAND_TIMING_0 register, address=70008014h */
-#define CONFIG_TEGRA2_NAND_TIMING 0x15040001
-/* Value to be set to NAND_TIMING2_0 register, address=7000801Ch */
-#define CONFIG_TEGRA2_NAND_TIMING2 0x01
diff --git a/include/configs/chromeos/tegra2/harmony/parts/pinmux.h b/include/configs/chromeos/tegra2/harmony/parts/pinmux.h
deleted file mode 100644
index 67e9fb3..0000000
--- a/include/configs/chromeos/tegra2/harmony/parts/pinmux.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#define CONFIG_TEGRA2_PINMUX_DISPLAY_HARMONY \
- PINMUX(LCSN, DISPLAYA, PULL_UP, TRISTATE) \
- PINMUX(LD0, DISPLAYA, PULL_DOWN, NORMAL) \
- PINMUX(LD1, DISPLAYA, PULL_DOWN, NORMAL) \
- PINMUX(LD10, DISPLAYA, PULL_DOWN, NORMAL) \
- PINMUX(LD11, DISPLAYA, PULL_DOWN, NORMAL) \
- PINMUX(LD12, DISPLAYA, PULL_DOWN, NORMAL) \
- PINMUX(LD13, DISPLAYA, PULL_DOWN, NORMAL) \
- PINMUX(LD14, DISPLAYA, PULL_DOWN, NORMAL) \
- PINMUX(LD15, DISPLAYA, PULL_DOWN, NORMAL) \
- PINMUX(LD16, DISPLAYA, PULL_DOWN, NORMAL) \
- PINMUX(LD17, DISPLAYA, PULL_DOWN, NORMAL) \
- PINMUX(LD2, DISPLAYA, PULL_DOWN, NORMAL) \
- PINMUX(LD3, DISPLAYA, PULL_DOWN, NORMAL) \
- PINMUX(LD4, DISPLAYA, PULL_DOWN, NORMAL) \
- PINMUX(LD5, DISPLAYA, PULL_DOWN, NORMAL) \
- PINMUX(LD6, DISPLAYA, PULL_DOWN, NORMAL) \
- PINMUX(LD7, DISPLAYA, PULL_DOWN, NORMAL) \
- PINMUX(LD8, DISPLAYA, PULL_DOWN, NORMAL) \
- PINMUX(LD9, DISPLAYA, PULL_DOWN, NORMAL) \
- PINMUX(LDI, DISPLAYA, PULL_DOWN, NORMAL) \
- PINMUX(LHP0, DISPLAYA, PULL_DOWN, NORMAL) \
- PINMUX(LHP1, DISPLAYA, PULL_DOWN, NORMAL) \
- PINMUX(LHP2, DISPLAYA, PULL_DOWN, NORMAL) \
- PINMUX(LHS, DISPLAYA, PULL_UP, NORMAL) \
- PINMUX(LM0, DISPLAYA, PULL_UP, NORMAL) \
- PINMUX(LM1, DISPLAYA, PULL_UP, TRISTATE) \
- PINMUX(LPP, DISPLAYA, PULL_DOWN, NORMAL) \
- PINMUX(LPW0, DISPLAYA, PULL_UP, NORMAL) \
- PINMUX(LPW1, DISPLAYA, PULL_UP, TRISTATE) \
- PINMUX(LPW2, DISPLAYA, PULL_UP, NORMAL) \
- PINMUX(LSC0, DISPLAYA, PULL_UP, NORMAL) \
- PINMUX(LSC1, DISPLAYA, PULL_UP, TRISTATE) \
- PINMUX(LSCK, DISPLAYA, PULL_UP, TRISTATE) \
- PINMUX(LSDA, DISPLAYA, PULL_UP, TRISTATE) \
- PINMUX(LSDI, DISPLAYA, PULL_UP, TRISTATE) \
- PINMUX(LSPI, DISPLAYA, PULL_UP, NORMAL) \
- PINMUX(LVP0, DISPLAYA, PULL_UP, TRISTATE) \
- PINMUX(LVP1, DISPLAYA, PULL_DOWN, NORMAL) \
- PINMUX(LVS, DISPLAYA, PULL_UP, NORMAL) \
- PINMUX(SDC, PWM, PULL_UP, NORMAL)
-
-#define CONFIG_TEGRA2_PINMUX \
- CONFIG_TEGRA2_PINMUX_DISPLAY_HARMONY
diff --git a/include/configs/chromeos/tegra2/harmony/parts/uart.h b/include/configs/chromeos/tegra2/harmony/parts/uart.h
deleted file mode 100644
index 970b148..0000000
--- a/include/configs/chromeos/tegra2/harmony/parts/uart.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2011, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-/* UARTD: keyboard satellite board uart, default */
-#define CONFIG_SYS_NS16550_COM1 NV_ADDRESS_MAP_APB_UARTD_BASE
-
-/* UARTA: debug board uart */
-#define CONFIG_SYS_NS16550_COM2 NV_ADDRESS_MAP_APB_UARTA_BASE
diff --git a/include/configs/chromeos/tegra2/harmony/parts/usb.h b/include/configs/chromeos/tegra2/harmony/parts/usb.h
deleted file mode 100644
index d44a073..0000000
--- a/include/configs/chromeos/tegra2/harmony/parts/usb.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2011, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#define USB_CONTROLLER_INSTANCES 2
-
-/* To set base address of USB controller */
-#define NvUSBx_0 USB_EHCI_TEGRA_BASE_ADDR_USB3
-#define NvUSBx_1 USB_EHCI_TEGRA_BASE_ADDR_USB1
-#define NvUSBx_2 0
-#define NvUSBx_3 0
diff --git a/include/configs/chromeos/tegra2/harmony/recovery.h b/include/configs/chromeos/tegra2/harmony/recovery.h
deleted file mode 100644
index fc88d6b..0000000
--- a/include/configs/chromeos/tegra2/harmony/recovery.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_harmony_recovery_h__
-#define __configs_chromeos_tegra2_harmony_recovery_h__
-
-#include <configs/chromeos/tegra2/recovery.h>
-#include <configs/chromeos/tegra2/harmony/common.h>
-
-#define CONFIG_BOOTCOMMAND \
- "run usb0_boot ; " \
- "run usb1_boot ; " \
- "run mmc1_boot ; " \
- "run mmc0_boot"
-
-#include <configs/chromeos/tegra2/harmony/parts/usb.h>
-
-#endif /*__configs_chromeos_tegra2_harmony_recovery_h__*/
diff --git a/include/configs/chromeos/tegra2/harmony/stub.h b/include/configs/chromeos/tegra2/harmony/stub.h
deleted file mode 100644
index 2db825f..0000000
--- a/include/configs/chromeos/tegra2/harmony/stub.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_harmony_stub_h__
-#define __configs_chromeos_tegra2_harmony_stub_h__
-
-#include <configs/chromeos/tegra2/stub.h>
-#include <configs/chromeos/tegra2/harmony/common.h>
-
-#endif /*__configs_chromeos_tegra2_harmony_stub_h__*/
diff --git a/include/configs/chromeos/tegra2/kaen/common.h b/include/configs/chromeos/tegra2/kaen/common.h
deleted file mode 100644
index 578696c..0000000
--- a/include/configs/chromeos/tegra2/kaen/common.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_kaen_common_h__
-#define __configs_chromeos_tegra2_kaen_common_h__
-
-#include <configs/chromeos/tegra2/common.h>
-
-/* Use default firmware layout */
-#include <configs/chromeos/firmware_layout.h>
-
-#define LINUX_MACH_TYPE MACH_TYPE_KAEN
-#define CONFIG_SYS_BOARD_ODMDATA 0x300d8011 /* lp1, 1GB */
-
-#define CONFIG_SERIAL_MULTI 1
-#define CONFIG_TEGRA2_ENABLE_UARTB 1
-#define CONFIG_TEGRA2_KEYBOARD 1
-#define CONFIG_KEYBOARD 1
-
-#define CONFIG_CONSOLE_MUX 1
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV 1
-
-#define CONFIG_EXTRA_ENV_SETTINGS_BOARD \
- "stdin=serial,tegra-kbc\0" \
- "stdout=serial,lcd\0" \
- "stderr=serial,lcd\0"
-
-#define CONFIG_PLATFORM_EXTRAS_BOARD \
- "mem=384M@0M nvmem=128M@384M mem=512M@512M"
-
-#include <configs/chromeos/tegra2/kaen/parts/i2c.h>
-#include <configs/chromeos/tegra2/kaen/parts/keyboard.h>
-#include <configs/chromeos/tegra2/kaen/parts/lcd.h>
-#include <configs/chromeos/tegra2/kaen/parts/mmc.h>
-#include <configs/chromeos/tegra2/kaen/parts/pinmux.h>
-#include <configs/chromeos/tegra2/kaen/parts/spi.h>
-#include <configs/chromeos/tegra2/kaen/parts/uart.h>
-#include <configs/chromeos/tegra2/kaen/parts/tpm.h>
-
-#define CONFIG_CHROMEOS_HWID "ARM KAEN TEST 3084"
-
-#define CONFIG_CHROMEOS_FIRMWARE_STORAGE_SPI
-#define CONFIG_CHROMEOS_DEFAULT_FIRMWARE_STORAGE_SPI
-
-#endif /*__configs_chromeos_tegra2_kaen_common_h__*/
diff --git a/include/configs/chromeos/tegra2/kaen/developer.h b/include/configs/chromeos/tegra2/kaen/developer.h
deleted file mode 100644
index 40c3c05..0000000
--- a/include/configs/chromeos/tegra2/kaen/developer.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_kaen_developer_h__
-#define __configs_chromeos_tegra2_kaen_developer_h__
-
-#include <configs/chromeos/tegra2/developer.h>
-#include <configs/chromeos/tegra2/kaen/common.h>
-
-#include <configs/chromeos/tegra2/kaen/parts/usb.h>
-
-#define CONFIG_CMD_CROS_TPM
-
-#endif /*__configs_chromeos_tegra2_kaen_developer_h__*/
diff --git a/include/configs/chromeos/tegra2/kaen/flasher.h b/include/configs/chromeos/tegra2/kaen/flasher.h
deleted file mode 100644
index 0603ad5..0000000
--- a/include/configs/chromeos/tegra2/kaen/flasher.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_kaen_flasher_h__
-#define __configs_chromeos_tegra2_kaen_flasher_h__
-
-#include <configs/chromeos/tegra2/flasher.h>
-#include <configs/chromeos/tegra2/kaen/common.h>
-
-#endif /*__configs_chromeos_tegra2_kaen_flasher_h__*/
diff --git a/include/configs/chromeos/tegra2/kaen/normal.h b/include/configs/chromeos/tegra2/kaen/normal.h
deleted file mode 100644
index 60899c5..0000000
--- a/include/configs/chromeos/tegra2/kaen/normal.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_kaen_normal_h__
-#define __configs_chromeos_tegra2_kaen_normal_h__
-
-#include <configs/chromeos/tegra2/normal.h>
-#include <configs/chromeos/tegra2/kaen/common.h>
-
-#include <configs/chromeos/tegra2/kaen/parts/mmc.h>
-
-#endif /*__configs_chromeos_tegra2_kaen_normal_h__*/
diff --git a/include/configs/chromeos/tegra2/kaen/parts/i2c.h b/include/configs/chromeos/tegra2/kaen/parts/i2c.h
deleted file mode 100644
index d67535e..0000000
--- a/include/configs/chromeos/tegra2/kaen/parts/i2c.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2011, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#define CONFIG_I2CP_PIN_MUX 1
-#define CONFIG_I2C1_PIN_MUX 1
-#define CONFIG_I2C2_PIN_MUX 2
-#define CONFIG_I2C3_PIN_MUX 1
diff --git a/include/configs/chromeos/tegra2/kaen/parts/keyboard.h b/include/configs/chromeos/tegra2/kaen/parts/keyboard.h
deleted file mode 100644
index 36f04d4..0000000
--- a/include/configs/chromeos/tegra2/kaen/parts/keyboard.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#define CONFIG_TEGRA2_KBC_PLAIN_KEYCODES \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0x1b, 0x09, '`', 'a', 'z', '1', 'q', \
- 0, 0, 0, 0, 'd', 'c', '3', 'e', \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 'b', 'g', 't', '5', 'f', 'v', '4', 'r', \
- 0, 0, 0, 0, 's', 'x', '2', 'w', \
- 0, 0, ']', 0, 'k', ',', '8', 'i', \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 'n', 'h', 'y', '6', 'j', 'm', '7', 'u', \
- 0, 0, 0, 0, 0, KEY_SHIFT, 0, KEY_SHIFT, \
- '=', '\'', '[', '-', ';', '/', '0', 'p', \
- 0, 0, 0, 0, 'l', '.', '9', 'o', \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0x08, 0, '\\', '\r', ' ', 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0,
-
-#define CONFIG_TEGRA2_KBC_SHIFT_KEYCODES \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0x1b, 0x09, '~', 'A', 'Z', '!', 'Q', \
- 0, 0, 0, 0, 'D', 'C', '#', 'E', \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 'B', 'G', 'T', '%', 'F', 'V', '$', 'R', \
- 0, 0, 0, 0, 'S', 'X', '@', 'W', \
- 0, 0, '}', 0, 'K', '<', '*', 'I', \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 'N', 'H', 'Y', '^', 'J', 'M', '&', 'U', \
- 0, 0, 0, 0, 0, KEY_SHIFT, 0, KEY_SHIFT, \
- '+', '"', '{', '_', ':', '?', ')', 'P', \
- 0, 0, 0, 0, 'L', '>', '(', 'O', \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0x08, 0, '|', '\r', ' ', 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0,
-
-#define CONFIG_TEGRA2_KBC_FUNCTION_KEYCODES \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0,
diff --git a/include/configs/chromeos/tegra2/kaen/parts/lcd.h b/include/configs/chromeos/tegra2/kaen/parts/lcd.h
deleted file mode 100644
index a1bc8c1..0000000
--- a/include/configs/chromeos/tegra2/kaen/parts/lcd.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#define CONFIG_LCD_vl_col 1366
-#define CONFIG_LCD_vl_row 768
-
-#define TEGRA_GPIO_INIT_LCD TEGRA_GPIO_INIT_LCD_CHROMEOS_1
-#define TEGRA_CLOCK_INIT_LCD TEGRA_CLOCK_INIT_LCD_CHROMEOS_1
-#define TEGRA_RESOURCE_LCD TEGRA_RESOURCE_LCD_CHROMEOS_1
-#define TEGRA_PANEL_MODE TEGRA_PANEL_MODE_CHROMEOS_1
diff --git a/include/configs/chromeos/tegra2/kaen/parts/mmc.h b/include/configs/chromeos/tegra2/kaen/parts/mmc.h
deleted file mode 100644
index 2b87f04..0000000
--- a/include/configs/chromeos/tegra2/kaen/parts/mmc.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2011, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-/* Define this if device is always on EMMC4 controller and no Card Detect pin */
-#define CONFIG_TEGRA2_EMMC4_ALWAYS_INSERTED 1
-#define CONFIG_TEGRA2_EMMC4_IS_HS 1 /* only HS parts used */
-
-#define MMC_DEV_INSTANCES 2
-#define NvEmmcx_0 NvEmmc4
-#define NvEmmcx_1 NvEmmc3
-#define NvEmmcx_2 0
-#define NvEmmcx_3 0
diff --git a/include/configs/chromeos/tegra2/kaen/parts/pinmux.h b/include/configs/chromeos/tegra2/kaen/parts/pinmux.h
deleted file mode 100644
index 528698d..0000000
--- a/include/configs/chromeos/tegra2/kaen/parts/pinmux.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#define CONFIG_TEGRA2_PINMUX \
- CONFIG_TEGRA2_PINMUX_DISPLAY_CROS_1
diff --git a/include/configs/chromeos/tegra2/kaen/parts/spi.h b/include/configs/chromeos/tegra2/kaen/parts/spi.h
deleted file mode 100644
index c0fab33..0000000
--- a/include/configs/chromeos/tegra2/kaen/parts/spi.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2011, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#define CONFIG_TEGRA2_SPI
-#define CONFIG_SPI_FLASH
-#define CONFIG_SPI_FLASH_WINBOND
-#define CONFIG_SPI_FLASH_SLOW_READ
-#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
-#define CONFIG_CMD_SPI
-#define CONFIG_CMD_SF
diff --git a/include/configs/chromeos/tegra2/kaen/parts/tpm.h b/include/configs/chromeos/tegra2/kaen/parts/tpm.h
deleted file mode 100644
index 6702881..0000000
--- a/include/configs/chromeos/tegra2/kaen/parts/tpm.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-/* this macro enable tlcl stub to call real hardware functions */
-#define CONFIG_HARDWARE_TPM
-
-/* config for infineon prototype i2c tpm chip */
-#define CONFIG_INFINEON_TPM_I2C
-#define CONFIG_INFINEON_TPM_I2C_BUS 2
-
-/* auto detect all following chips selected below */
-#define CONFIG_TPM_SLB9635_I2C
-#define CONFIG_TPM_SLB9635_I2C_V03
-
-/* limit burst write to tpm chip on i2c */
-#define CONFIG_TPM_I2C_BURST_LIMITATION 3
diff --git a/include/configs/chromeos/tegra2/kaen/parts/uart.h b/include/configs/chromeos/tegra2/kaen/parts/uart.h
deleted file mode 100644
index 939efe3..0000000
--- a/include/configs/chromeos/tegra2/kaen/parts/uart.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2011, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#define CONFIG_SYS_NS16550_COM1 NV_ADDRESS_MAP_APB_UARTB_BASE
diff --git a/include/configs/chromeos/tegra2/kaen/parts/usb.h b/include/configs/chromeos/tegra2/kaen/parts/usb.h
deleted file mode 100644
index d7454ce..0000000
--- a/include/configs/chromeos/tegra2/kaen/parts/usb.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2011, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-/* To set base address of USB controller */
-#define NvUSBx_0 USB_EHCI_TEGRA_BASE_ADDR_USB3
-#define NvUSBx_1 USB_EHCI_TEGRA_BASE_ADDR_USB1
-#define NvUSBx_2 0
-#define NvUSBx_3 0
-
-/*
- * USB1 takes 3 ms to clear Port Reset bit after issuing a Port Reset.
- * The expected time is 2 ms. Please refer to page 28 of EHCI 1.0 specification.
- */
-#define CONFIG_USB_RESET_CLEARED_MS 3 * 1000
diff --git a/include/configs/chromeos/tegra2/kaen/recovery.h b/include/configs/chromeos/tegra2/kaen/recovery.h
deleted file mode 100644
index ab82e6d..0000000
--- a/include/configs/chromeos/tegra2/kaen/recovery.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_kaen_recovery_h__
-#define __configs_chromeos_tegra2_kaen_recovery_h__
-
-#include <configs/chromeos/tegra2/recovery.h>
-#include <configs/chromeos/tegra2/kaen/common.h>
-
-#define CONFIG_BOOTCOMMAND \
- "run usb0_boot ; " \
- "run usb1_boot ; " \
- "run mmc1_boot ; " \
- "run mmc0_boot"
-
-#include <configs/chromeos/tegra2/kaen/parts/usb.h>
-
-#endif /*__configs_chromeos_tegra2_kaen_recovery_h__*/
diff --git a/include/configs/chromeos/tegra2/kaen/stub.h b/include/configs/chromeos/tegra2/kaen/stub.h
deleted file mode 100644
index e07a6d5..0000000
--- a/include/configs/chromeos/tegra2/kaen/stub.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_kaen_stub_h__
-#define __configs_chromeos_tegra2_kaen_stub_h__
-
-#include <configs/chromeos/tegra2/stub.h>
-#include <configs/chromeos/tegra2/kaen/common.h>
-
-#endif /*__configs_chromeos_tegra2_kaen_stub_h__*/
diff --git a/include/configs/chromeos/tegra2/normal.h b/include/configs/chromeos/tegra2/normal.h
deleted file mode 100644
index 0174697..0000000
--- a/include/configs/chromeos/tegra2/normal.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_normal_h__
-#define __configs_chromeos_tegra2_normal_h__
-
-#include <configs/chromeos/normal.h>
-#include <configs/chromeos/tegra2/common.h>
-
-#include <configs/chromeos/tegra2/parts/mmc.h>
-
-#define CONFIG_EXTRA_ENV_SETTINGS_ARCH CONFIG_EXTRA_ENV_SETTINGS_ARCH_COMMON
-
-#endif //__configs_chromeos_tegra2_normal_h__
diff --git a/include/configs/chromeos/tegra2/parts/gpio.h b/include/configs/chromeos/tegra2/parts/gpio.h
deleted file mode 100644
index a5b888c..0000000
--- a/include/configs/chromeos/tegra2/parts/gpio.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2010, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#define CONFIG_TEGRA2_GPIO 1
-#define CONFIG_CMD_TEGRA2_GPIO_INFO 1
diff --git a/include/configs/chromeos/tegra2/parts/i2c.h b/include/configs/chromeos/tegra2/parts/i2c.h
deleted file mode 100644
index 3a2b572..0000000
--- a/include/configs/chromeos/tegra2/parts/i2c.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2010, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#define CONFIG_TEGRA2_I2C
-#define CONFIG_CMD_I2C
-#define CONFIG_I2C_MULTI_BUS 1
-#define CONFIG_SYS_MAX_I2C_BUS 4
-#define CONFIG_SYS_I2C_SPEED 100000
diff --git a/include/configs/chromeos/tegra2/parts/lcd.h b/include/configs/chromeos/tegra2/parts/lcd.h
deleted file mode 100644
index 26699db..0000000
--- a/include/configs/chromeos/tegra2/parts/lcd.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#define CONFIG_LCD
-#define CONFIG_TEGRA2_LCD
-#define LCD_BPP LCD_COLOR16
-#define LCD_FB_ADDR 0x1C022000 /* FB could be passed from bl */
-#define CONFIG_SYS_WHITE_ON_BLACK /*Console colors*/
-
-#define TEGRA_GPIO_BACKLIGHT_CHROMEOS_1 TEGRA_GPIO_PD4
-#define TEGRA_GPIO_LVDS_SHUTDOWN_CHROMEOS_1 TEGRA_GPIO_PB2
-#define TEGRA_GPIO_BACKLIGHT_VDD_CHROMEOS_1 TEGRA_GPIO_PW0
-#define TEGRA_GPIO_EN_VDD_PNL_CHROMEOS_1 TEGRA_GPIO_PC6
-
-#define TEGRA_GPIO_INIT_LCD_CHROMEOS_1 \
- TEGRA_GPIO_INIT(TEGRA_GPIO_BACKLIGHT_CHROMEOS_1, true) \
- TEGRA_GPIO_INIT(TEGRA_GPIO_LVDS_SHUTDOWN_CHROMEOS_1, true) \
- TEGRA_GPIO_INIT(TEGRA_GPIO_BACKLIGHT_VDD_CHROMEOS_1, false) \
- TEGRA_GPIO_INIT(TEGRA_GPIO_EN_VDD_PNL_CHROMEOS_1, true)
-
-#define TEGRA_CLOCK_INIT_LCD_CHROMEOS_1 \
- TEGRA_CLOCK("3d", "pll_m", 300000000, true) \
- TEGRA_CLOCK("2d", "pll_m", 300000000, true) \
- TEGRA_CLOCK("host1x", "pll_p", 144000000, true) \
- TEGRA_CLOCK("disp1", "pll_p", 216000000, true) \
- TEGRA_CLOCK("pwm", "clk_32k", 32768, true)
-
-#define TEGRA_RESOURCE_LCD_CHROMEOS_1 \
- TEGRA_RESOURCE("irq", 0x69, 1) \
- TEGRA_RESOURCE("regs", TEGRA_DISPLAY_BASE, TEGRA_DISPLAY_SIZE) \
- TEGRA_RESOURCE("fbmem", LCD_FB_ADDR, 0x4000000) \
- TEGRA_RESOURCE("pwm", TEGRA_PWFM2_BASE, TEGRA_PWFM2_SIZE)
-
-#define TEGRA_PANEL_MODE_CHROMEOS_1 \
- TEGRA_PANEL(pclk, 62200000) \
- TEGRA_PANEL(h_ref_to_sync, 11) \
- TEGRA_PANEL(v_ref_to_sync, 1) \
- TEGRA_PANEL(h_sync_width, 58) \
- TEGRA_PANEL(v_sync_width, 4) \
- TEGRA_PANEL(h_back_porch, 58) \
- TEGRA_PANEL(v_back_porch, 4) \
- TEGRA_PANEL(h_front_porch, 58) \
- TEGRA_PANEL(v_front_porch, 4)
diff --git a/include/configs/chromeos/tegra2/parts/mmc.h b/include/configs/chromeos/tegra2/parts/mmc.h
deleted file mode 100644
index f68fcbf..0000000
--- a/include/configs/chromeos/tegra2/parts/mmc.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2010, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#define CONFIG_TEGRA2_MMC 1
diff --git a/include/configs/chromeos/tegra2/parts/nand.h b/include/configs/chromeos/tegra2/parts/nand.h
deleted file mode 100644
index 15cd7b1..0000000
--- a/include/configs/chromeos/tegra2/parts/nand.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2010, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#define CONFIG_CMD_NAND
-#define CONFIG_TEGRA2_NAND
-#define CONFIG_SYS_NAND_ADDR NAND_BASE
-#define CONFIG_SYS_NAND_BASE NAND_BASE
-#define CONFIG_SYS_MAX_NAND_DEVICE 1
diff --git a/include/configs/chromeos/tegra2/parts/pinmux.h b/include/configs/chromeos/tegra2/parts/pinmux.h
deleted file mode 100644
index 767027e..0000000
--- a/include/configs/chromeos/tegra2/parts/pinmux.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#define PINMUX(group, mux, pupd, tri) \
- {TEGRA_PINGROUP_##group, TEGRA_MUX_##mux, \
- TEGRA_PUPD_##pupd, TEGRA_TRI_##tri},
-
-#define CONFIG_TEGRA2_PINMUX_DISPLAY_CROS_1 \
- PINMUX(GPU, PWM, NORMAL, NORMAL) \
- PINMUX(LD0, DISPLAYA, NORMAL, NORMAL) \
- PINMUX(LD1, DISPLAYA, NORMAL, NORMAL) \
- PINMUX(LD10, DISPLAYA, NORMAL, NORMAL) \
- PINMUX(LD11, DISPLAYA, NORMAL, NORMAL) \
- PINMUX(LD12, DISPLAYA, NORMAL, NORMAL) \
- PINMUX(LD13, DISPLAYA, NORMAL, NORMAL) \
- PINMUX(LD14, DISPLAYA, NORMAL, NORMAL) \
- PINMUX(LD15, DISPLAYA, NORMAL, NORMAL) \
- PINMUX(LD16, DISPLAYA, NORMAL, NORMAL) \
- PINMUX(LD17, DISPLAYA, NORMAL, NORMAL) \
- PINMUX(LD2, DISPLAYA, NORMAL, NORMAL) \
- PINMUX(LD3, DISPLAYA, NORMAL, NORMAL) \
- PINMUX(LD4, DISPLAYA, NORMAL, NORMAL) \
- PINMUX(LD5, DISPLAYA, NORMAL, NORMAL) \
- PINMUX(LD6, DISPLAYA, NORMAL, NORMAL) \
- PINMUX(LD7, DISPLAYA, NORMAL, NORMAL) \
- PINMUX(LD8, DISPLAYA, NORMAL, NORMAL) \
- PINMUX(LD9, DISPLAYA, NORMAL, NORMAL) \
- PINMUX(LDI, DISPLAYA, NORMAL, NORMAL) \
- PINMUX(LHP0, DISPLAYA, NORMAL, NORMAL) \
- PINMUX(LHP1, DISPLAYA, NORMAL, NORMAL) \
- PINMUX(LHP2, DISPLAYA, NORMAL, NORMAL) \
- PINMUX(LHS, DISPLAYA, NORMAL, NORMAL) \
- PINMUX(LM0, RSVD4, NORMAL, NORMAL) \
- PINMUX(LPP, DISPLAYA, NORMAL, NORMAL) \
- PINMUX(LPW0, RSVD4, NORMAL, NORMAL) \
- PINMUX(LPW1, RSVD4, NORMAL, TRISTATE) \
- PINMUX(LPW2, RSVD4, NORMAL, NORMAL) \
- PINMUX(LSC0, DISPLAYA, NORMAL, NORMAL) \
- PINMUX(LSPI, DISPLAYA, NORMAL, NORMAL) \
- PINMUX(LVP1, DISPLAYA, NORMAL, NORMAL) \
- PINMUX(LVS, DISPLAYA, NORMAL, NORMAL) \
- PINMUX(SLXD, SPDIF, NORMAL, NORMAL)
diff --git a/include/configs/chromeos/tegra2/parts/uart.h b/include/configs/chromeos/tegra2/parts/uart.h
deleted file mode 100644
index 2eb71c9..0000000
--- a/include/configs/chromeos/tegra2/parts/uart.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2010, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#define CONFIG_SYS_NS16550
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE (-4)
-#define CONFIG_SYS_NS16550_CLK 216000000 /* 216MHz (pllp_out0) */
-
-/*
- * select serial console configuration
- */
-#define CONFIG_CONS_INDEX 1
diff --git a/include/configs/chromeos/tegra2/parts/usb.h b/include/configs/chromeos/tegra2/parts/usb.h
deleted file mode 100644
index 2e4a0e8..0000000
--- a/include/configs/chromeos/tegra2/parts/usb.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2010, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#define CONFIG_CMD_USB
-#define CONFIG_USB_STORAGE
-
-#define CONFIG_USB_EHCI
-#define CONFIG_USB_EHCI_TEGRA
-#define CONFIG_USB_CONTROLLER_INSTANCES 2
-#define USB_EHCI_TEGRA_BASE_ADDR_USB3 0xC5008000 /* USB3 base address */
-#define USB_EHCI_TEGRA_BASE_ADDR_USB1 0xC5000000 /* USB1 base address */
-#define CONFIG_USB_EHCI_DATA_ALIGN 4
-
-/*
- * This parameter affects a TXFILLTUNING field that controls how much data is
- * sent to the latency fifo before it is sent to the wire. Without this
- * parameter, the default (2) causes occasional Data Buffer Errors in OUT
- * packets depending on the buffer address and size.
- */
-#define CONFIG_USB_EHCI_TXFIFO_THRESH 10
-
-#define CONFIG_EHCI_IS_TDI
diff --git a/include/configs/chromeos/tegra2/recovery.h b/include/configs/chromeos/tegra2/recovery.h
deleted file mode 100644
index 33217d3..0000000
--- a/include/configs/chromeos/tegra2/recovery.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_recovery_h__
-#define __configs_chromeos_tegra2_recovery_h__
-
-#include <configs/chromeos/recovery.h>
-#include <configs/chromeos/tegra2/common.h>
-
-#include <configs/chromeos/tegra2/parts/usb.h>
-
-#define CONFIG_EXTRA_ENV_SETTINGS_ARCH CONFIG_EXTRA_ENV_SETTINGS_ARCH_COMMON
-
-#endif //__configs_chromeos_tegra2_recovery_h__
diff --git a/include/configs/chromeos/tegra2/seaboard/common.h b/include/configs/chromeos/tegra2/seaboard/common.h
deleted file mode 100644
index 8edcc8a..0000000
--- a/include/configs/chromeos/tegra2/seaboard/common.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_seaboard_common_h__
-#define __configs_chromeos_tegra2_seaboard_common_h__
-
-#include <configs/chromeos/tegra2/common.h>
-
-/* Use Seaboard-specific firmware layout */
-#include <configs/chromeos/tegra2/seaboard/firmware_layout.h>
-
-#define LINUX_MACH_TYPE MACH_TYPE_SEABOARD
-#define CONFIG_SYS_BOARD_ODMDATA 0x300d8011 /* lp1, 1GB */
-
-#define CONFIG_SERIAL_MULTI 1
-#define CONFIG_TEGRA2_ENABLE_UARTD 1
-#define CONFIG_TEGRA2_KEYBOARD 1
-#define CONFIG_KEYBOARD 1
-
-#define CONFIG_CONSOLE_MUX 1
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV 1
-
-#define CONFIG_EXTRA_ENV_SETTINGS_BOARD \
- "stdin=serial,tegra-kbc\0" \
- "stdout=serial,lcd\0" \
- "stderr=serial,lcd\0"
-
-#define CONFIG_PLATFORM_EXTRAS_BOARD \
- "mem=384M@0M nvmem=128M@384M mem=512M@512M"
-
-#include <configs/chromeos/tegra2/seaboard/parts/i2c.h>
-#include <configs/chromeos/tegra2/seaboard/parts/keyboard.h>
-#include <configs/chromeos/tegra2/seaboard/parts/lcd.h>
-#include <configs/chromeos/tegra2/seaboard/parts/mmc.h>
-#include <configs/chromeos/tegra2/seaboard/parts/pinmux.h>
-#include <configs/chromeos/tegra2/seaboard/parts/spi.h>
-#include <configs/chromeos/tegra2/seaboard/parts/uart.h>
-#include <configs/chromeos/tegra2/seaboard/parts/tpm.h>
-
-#define CONFIG_CHROMEOS_HWID "ARM SEABOARD TEST 1176"
-
-#define CONFIG_CHROMEOS_FIRMWARE_STORAGE_SPI
-#define CONFIG_CHROMEOS_DEFAULT_FIRMWARE_STORAGE_SPI
-
-#endif /*__configs_chromeos_tegra2_seaboard_common_h__*/
diff --git a/include/configs/chromeos/tegra2/seaboard/developer.h b/include/configs/chromeos/tegra2/seaboard/developer.h
deleted file mode 100644
index a745eca..0000000
--- a/include/configs/chromeos/tegra2/seaboard/developer.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_seaboard_developer_h__
-#define __configs_chromeos_tegra2_seaboard_developer_h__
-
-#include <configs/chromeos/tegra2/developer.h>
-#include <configs/chromeos/tegra2/seaboard/common.h>
-
-#include <configs/chromeos/tegra2/seaboard/parts/nand.h>
-#include <configs/chromeos/tegra2/seaboard/parts/usb.h>
-
-#define CONFIG_CMD_CROS_TPM
-
-#endif /*__configs_chromeos_tegra2_seaboard_developer_h__*/
diff --git a/include/configs/chromeos/tegra2/seaboard/firmware_layout.h b/include/configs/chromeos/tegra2/seaboard/firmware_layout.h
deleted file mode 100644
index dd7328d..0000000
--- a/include/configs/chromeos/tegra2/seaboard/firmware_layout.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#ifndef __SEABOARD_FIRMWARE_LAYOUT_H__
-
-/*
- * Use a smaller firmware image layout for Seaboard because it has
- * only 16MBit (=2MB) of SPI Flash.
- */
-
-#define CONFIG_FIRMWARE_SIZE 0x00200000 /* 2 MB */
-
-/* -- Region: Read-only ----------------------------------------------------- */
-
-/* ---- Section: Read-only firmware ----------------------------------------- */
-
-#define CONFIG_OFFSET_RO_SECTION 0x00000000
-#define CONFIG_LENGTH_RO_SECTION 0x000f0000
-
-#define CONFIG_OFFSET_BOOT_STUB 0x00000000
-#define CONFIG_LENGTH_BOOT_STUB 0x00088000
-
-#define CONFIG_OFFSET_RECOVERY 0x00088000
-#define CONFIG_LENGTH_RECOVERY 0x00040000
-
-#define CONFIG_OFFSET_RO_DATA 0x000c8000
-#define CONFIG_LENGTH_RO_DATA 0x00008000
-
-#define CONFIG_OFFSET_FMAP 0x000c8000
-#define CONFIG_LENGTH_FMAP 0x00000400
-
-#define CONFIG_OFFSET_GBB 0x000d0000
-#define CONFIG_LENGTH_GBB 0x00020000
-
-/* ---- Section: Vital-product data (VPD) ----------------------------------- */
-
-#define CONFIG_OFFSET_RO_VPD 0x000f0000
-#define CONFIG_LENGTH_RO_VPD 0x00010000
-
-/* -- Region: Writable ------------------------------------------------------ */
-
-/* ---- Section: Rewritable slot A ------------------------------------------ */
-
-#define CONFIG_OFFSET_RW_SECTION_A 0x00100000
-#define CONFIG_LENGTH_RW_SECTION_A 0x00078000
-
-#define CONFIG_OFFSET_VBLOCK_A 0x00100000
-#define CONFIG_LENGTH_VBLOCK_A 0x00010000
-
-#define CONFIG_OFFSET_FW_MAIN_A 0x00110000
-#define CONFIG_LENGTH_FW_MAIN_A 0x00068000
-
-#define CONFIG_OFFSET_DATA_A 0x00100000
-#define CONFIG_LENGTH_DATA_A 0x00000000
-
-/* ---- Section: Rewritable slot B ------------------------------------------ */
-
-#define CONFIG_OFFSET_RW_SECTION_B 0x00178000
-#define CONFIG_LENGTH_RW_SECTION_B 0x00078000
-
-#define CONFIG_OFFSET_VBLOCK_B 0x00178000
-#define CONFIG_LENGTH_VBLOCK_B 0x00010000
-
-#define CONFIG_OFFSET_FW_MAIN_B 0x00188000
-#define CONFIG_LENGTH_FW_MAIN_B 0x00068000
-
-#define CONFIG_OFFSET_DATA_B 0x00178000
-#define CONFIG_LENGTH_DATA_B 0x00000000
-
-/* ---- Section: Rewritable VPD --------------------------------------------- */
-
-#define CONFIG_OFFSET_RW_VPD 0x001f0000
-#define CONFIG_LENGTH_RW_VPD 0x00008000
-
-/* ---- Section: Rewritable shared ------------------------------------------ */
-
-#define CONFIG_OFFSET_RW_SHARED 0x001f8000
-#define CONFIG_LENGTH_RW_SHARED 0x00008000
-
-#define CONFIG_OFFSET_DEV_CFG 0x001f8000
-#define CONFIG_LENGTH_DEV_CFG 0x00004000
-
-#define CONFIG_OFFSET_SHARED_DATA 0x001fc000
-#define CONFIG_LENGTH_SHARED_DATA 0x00002000
-
-#define CONFIG_OFFSET_VBNVCONTEXT 0x001fe000
-#define CONFIG_LENGTH_VBNVCONTEXT 0x00001000
-
-/* where are the meanings of these documented? Add a comment/link here */
-#define CONFIG_OFFSET_ENV 0x001ff000
-#define CONFIG_LENGTH_ENV 0x00001000
-
-#endif /* __SEABOARD_FIRMWARE_LAYOUT_H__ */
diff --git a/include/configs/chromeos/tegra2/seaboard/flasher.h b/include/configs/chromeos/tegra2/seaboard/flasher.h
deleted file mode 100644
index 4eea523..0000000
--- a/include/configs/chromeos/tegra2/seaboard/flasher.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_seaboard_flasher_h__
-#define __configs_chromeos_tegra2_seaboard_flasher_h__
-
-#include <configs/chromeos/tegra2/flasher.h>
-#include <configs/chromeos/tegra2/seaboard/common.h>
-
-#include <configs/chromeos/tegra2/seaboard/parts/nand.h>
-
-#endif /*__configs_chromeos_tegra2_seaboard_flasher_h__*/
diff --git a/include/configs/chromeos/tegra2/seaboard/normal.h b/include/configs/chromeos/tegra2/seaboard/normal.h
deleted file mode 100644
index 6548e18..0000000
--- a/include/configs/chromeos/tegra2/seaboard/normal.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_seaboard_normal_h__
-#define __configs_chromeos_tegra2_seaboard_normal_h__
-
-#include <configs/chromeos/tegra2/normal.h>
-#include <configs/chromeos/tegra2/seaboard/common.h>
-
-#include <configs/chromeos/tegra2/seaboard/parts/mmc.h>
-
-#endif /*__configs_chromeos_tegra2_seaboard_normal_h__*/
diff --git a/include/configs/chromeos/tegra2/seaboard/parts/i2c.h b/include/configs/chromeos/tegra2/seaboard/parts/i2c.h
deleted file mode 100644
index 41c0fc4..0000000
--- a/include/configs/chromeos/tegra2/seaboard/parts/i2c.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2010, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#define CONFIG_I2CP_PIN_MUX 1
-#define CONFIG_I2C1_PIN_MUX 1
-#define CONFIG_I2C2_PIN_MUX 2
-#define CONFIG_I2C3_PIN_MUX 1
diff --git a/include/configs/chromeos/tegra2/seaboard/parts/keyboard.h b/include/configs/chromeos/tegra2/seaboard/parts/keyboard.h
deleted file mode 100644
index 7fd370d..0000000
--- a/include/configs/chromeos/tegra2/seaboard/parts/keyboard.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#define CONFIG_TEGRA2_KBC_PLAIN_KEYCODES \
- 0, 0, 'w', 's', 'a', 'z', 0, KEY_FN, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- '5', '4', 'r', 'e', 'f', 'd', 'x', 0, \
- '7', '6', 't', 'h', 'g', 'v', 'c', ' ', \
- '9', '8', 'u', 'y', 'j', 'n', 'b', '\\', \
- '-', '0', 'o', 'i', 'l', 'k', ',', 'm', \
- 0, '=', ']', '\r', 0, 0, 0, 0, \
- 0, 0, 0, 0, KEY_SHIFT, KEY_SHIFT, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- '[', 'p', '\'', ';', '/', '.', 0, 0, \
- 0, 0, 0x08, '3', '2', 0, 0, 0, \
- 0, 0x7F, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 'q', 0, 0, '1', 0, \
- 0x1B, '`', 0, 0x09, 0, 0, 0, 0
-
-#define CONFIG_TEGRA2_KBC_SHIFT_KEYCODES \
- 0, 0, 'W', 'S', 'A', 'Z', 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- '%', '$', 'R', 'E', 'F', 'D', 'X', 0, \
- '&', '^', 'T', 'H', 'G', 'V', 'C', ' ', \
- '(', '*', 'U', 'Y', 'J', 'N', 'B', '|', \
- '_', ')', 'O', 'I', 'L', 'K', ',', 'M', \
- 0, '+', '}', '\r', 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- '{', 'P', '"', ':', '?', '>', 0, 0, \
- 0, 0, 0x08, '#', '@', 0, 0, 0, \
- 0, 0x7F, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 'Q', 0, 0, '!', 0, \
- 0x1B, '~', 0, 0x09, 0, 0, 0, 0
-
-#define CONFIG_TEGRA2_KBC_FUNCTION_KEYCODES \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- '7', 0, 0, 0, 0, 0, 0, 0, \
- '9', '8', '4', 0, '1', 0, 0, 0, \
- 0, '/', '6', '5', '3', '2', 0, '0', \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, '\'', 0, '-', '+', '.', 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, '?', 0, 0, 0
diff --git a/include/configs/chromeos/tegra2/seaboard/parts/lcd.h b/include/configs/chromeos/tegra2/seaboard/parts/lcd.h
deleted file mode 100644
index a1bc8c1..0000000
--- a/include/configs/chromeos/tegra2/seaboard/parts/lcd.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#define CONFIG_LCD_vl_col 1366
-#define CONFIG_LCD_vl_row 768
-
-#define TEGRA_GPIO_INIT_LCD TEGRA_GPIO_INIT_LCD_CHROMEOS_1
-#define TEGRA_CLOCK_INIT_LCD TEGRA_CLOCK_INIT_LCD_CHROMEOS_1
-#define TEGRA_RESOURCE_LCD TEGRA_RESOURCE_LCD_CHROMEOS_1
-#define TEGRA_PANEL_MODE TEGRA_PANEL_MODE_CHROMEOS_1
diff --git a/include/configs/chromeos/tegra2/seaboard/parts/mmc.h b/include/configs/chromeos/tegra2/seaboard/parts/mmc.h
deleted file mode 100644
index 2bcb34a..0000000
--- a/include/configs/chromeos/tegra2/seaboard/parts/mmc.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2010, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-/* Define this if device is always on EMMC4 controller and no Card Detect pin */
-#define CONFIG_TEGRA2_EMMC4_ALWAYS_INSERTED 1
-#define CONFIG_TEGRA2_EMMC4_IS_HS 1 /* only HS parts used */
-
-#define MMC_DEV_INSTANCES 2
-#define NvEmmcx_0 NvEmmc4
-#define NvEmmcx_1 NvEmmc3
-#define NvEmmcx_2 0
-#define NvEmmcx_3 0
diff --git a/include/configs/chromeos/tegra2/seaboard/parts/nand.h b/include/configs/chromeos/tegra2/seaboard/parts/nand.h
deleted file mode 100644
index bfb96d0..0000000
--- a/include/configs/chromeos/tegra2/seaboard/parts/nand.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * (C) Copyright 2010
- * NVIDIA Corporation <www.nvidia.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-/* Set clock divisor
- * 7 bits of D and 1 bit of H
- * divisor= (DDDDDDD + 1) + (H x 0.5)
- * clock = original clock / divisor
- * 6 means /4 */
-#define CONFIG_NAND_CLK_DIVISOR_DDDDDDDH 6
-
-/* For HYNIX HY27UF4G2B
- * Frequence output of PLLP_OUT0 is set by BOOTROM to 216MHz
- * to CLK_RST_CONTROLLER_PLLP_BASE_0,
- * 216MHz / divisor 4 = 54MHZ
- * 1 clock = 18.5 ns = NAND_CLK_PERIOD
- * TRP_RESP_CNT=n, max(tRP, tREA)= max(12ns, 20ns)= 20ns for non-EDO mode
- * bit 31-28=n=1, generated timing= (n+1) * NAND_CLK_PERIOD= (1+1)* 18.5
- * TWB_CNT bit 27-24=n, tWB = 100ns = (n+1)* 18.5, so n= 5 (bit 27-24)
- * similar way for other fields, please refer to reference manual
- */
-/* Value to be set to NAND_TIMING_0 register, address=70008014h */
-#define CONFIG_TEGRA2_NAND_TIMING 0x15040001
-/* Value to be set to NAND_TIMING2_0 register, address=7000801Ch */
-#define CONFIG_TEGRA2_NAND_TIMING2 0x01
diff --git a/include/configs/chromeos/tegra2/seaboard/parts/pinmux.h b/include/configs/chromeos/tegra2/seaboard/parts/pinmux.h
deleted file mode 100644
index 528698d..0000000
--- a/include/configs/chromeos/tegra2/seaboard/parts/pinmux.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#define CONFIG_TEGRA2_PINMUX \
- CONFIG_TEGRA2_PINMUX_DISPLAY_CROS_1
diff --git a/include/configs/chromeos/tegra2/seaboard/parts/spi.h b/include/configs/chromeos/tegra2/seaboard/parts/spi.h
deleted file mode 100644
index 7c0453b..0000000
--- a/include/configs/chromeos/tegra2/seaboard/parts/spi.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2010, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#define CONFIG_TEGRA2_SPI
-#define CONFIG_SPI_FLASH
-#define CONFIG_SPI_FLASH_WINBOND
-#define CONFIG_SPI_FLASH_SLOW_READ
-#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
-#define CONFIG_CMD_SPI
-#define CONFIG_CMD_SF
diff --git a/include/configs/chromeos/tegra2/seaboard/parts/tpm.h b/include/configs/chromeos/tegra2/seaboard/parts/tpm.h
deleted file mode 100644
index 6702881..0000000
--- a/include/configs/chromeos/tegra2/seaboard/parts/tpm.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-/* this macro enable tlcl stub to call real hardware functions */
-#define CONFIG_HARDWARE_TPM
-
-/* config for infineon prototype i2c tpm chip */
-#define CONFIG_INFINEON_TPM_I2C
-#define CONFIG_INFINEON_TPM_I2C_BUS 2
-
-/* auto detect all following chips selected below */
-#define CONFIG_TPM_SLB9635_I2C
-#define CONFIG_TPM_SLB9635_I2C_V03
-
-/* limit burst write to tpm chip on i2c */
-#define CONFIG_TPM_I2C_BURST_LIMITATION 3
diff --git a/include/configs/chromeos/tegra2/seaboard/parts/uart.h b/include/configs/chromeos/tegra2/seaboard/parts/uart.h
deleted file mode 100644
index a96c2be..0000000
--- a/include/configs/chromeos/tegra2/seaboard/parts/uart.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2010, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-/* UARTD: keyboard satellite board uart, default */
-#define CONFIG_SYS_NS16550_COM1 NV_ADDRESS_MAP_APB_UARTD_BASE
-
-/* UARTA: debug board uart */
-#define CONFIG_SYS_NS16550_COM2 NV_ADDRESS_MAP_APB_UARTA_BASE
-
-/* On Seaboard, using SPI causes the UART pins to float */
-#define CONFIG_SPI_CORRUPTS_UART NV_ADDRESS_MAP_APB_UARTD_BASE
diff --git a/include/configs/chromeos/tegra2/seaboard/parts/usb.h b/include/configs/chromeos/tegra2/seaboard/parts/usb.h
deleted file mode 100644
index 0bdbaec..0000000
--- a/include/configs/chromeos/tegra2/seaboard/parts/usb.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2010, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-/* To set base address of USB controller */
-#define NvUSBx_0 USB_EHCI_TEGRA_BASE_ADDR_USB3
-#define NvUSBx_1 USB_EHCI_TEGRA_BASE_ADDR_USB1
-#define NvUSBx_2 0
-#define NvUSBx_3 0
-
-/*
- * USB1 takes 3 ms to clear Port Reset bit after issuing a Port Reset.
- * The expected time is 2 ms. Please refer to page 28 of EHCI 1.0 specification.
- */
-#define CONFIG_USB_RESET_CLEARED_MS 3 * 1000
diff --git a/include/configs/chromeos/tegra2/seaboard/recovery.h b/include/configs/chromeos/tegra2/seaboard/recovery.h
deleted file mode 100644
index 1f61c10..0000000
--- a/include/configs/chromeos/tegra2/seaboard/recovery.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_seaboard_recovery_h__
-#define __configs_chromeos_tegra2_seaboard_recovery_h__
-
-#include <configs/chromeos/tegra2/recovery.h>
-#include <configs/chromeos/tegra2/seaboard/common.h>
-
-#define CONFIG_BOOTCOMMAND \
- "run usb0_boot ; " \
- "run usb1_boot ; " \
- "run mmc1_boot ; " \
- "run mmc0_boot"
-
-#include <configs/chromeos/tegra2/seaboard/parts/usb.h>
-
-#endif /*__configs_chromeos_tegra2_seaboard_recovery_h__*/
diff --git a/include/configs/chromeos/tegra2/seaboard/stub.h b/include/configs/chromeos/tegra2/seaboard/stub.h
deleted file mode 100644
index aa9e7fe..0000000
--- a/include/configs/chromeos/tegra2/seaboard/stub.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_seaboard_stub_h__
-#define __configs_chromeos_tegra2_seaboard_stub_h__
-
-#include <configs/chromeos/tegra2/stub.h>
-#include <configs/chromeos/tegra2/seaboard/common.h>
-
-#endif /*__configs_chromeos_tegra2_seaboard_stub_h__*/
diff --git a/include/configs/chromeos/tegra2/stub.h b/include/configs/chromeos/tegra2/stub.h
deleted file mode 100644
index dd5d1a5..0000000
--- a/include/configs/chromeos/tegra2/stub.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_stub_h__
-#define __configs_chromeos_tegra2_stub_h__
-
-#include <configs/chromeos/stub.h>
-#include <configs/chromeos/tegra2/common.h>
-
-#define CONFIG_EXTRA_ENV_SETTINGS_ARCH CONFIG_EXTRA_ENV_SETTINGS_ARCH_COMMON
-
-/*
- * Boot stub is supposed to be loaded to fixed location, and so does not have
- * to able to relocate itself
- */
-#define CONFIG_SKIP_RELOCATE_UBOOT
-
-#endif //__configs_chromeos_tegra2_stub_h__
diff --git a/include/configs/chromeos/tegra2/wario/common.h b/include/configs/chromeos/tegra2/wario/common.h
deleted file mode 100644
index 60d4976..0000000
--- a/include/configs/chromeos/tegra2/wario/common.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_wario_common_h__
-#define __configs_chromeos_tegra2_wario_common_h__
-
-#include <configs/chromeos/tegra2/common.h>
-
-/* Use default firmware layout */
-#include <configs/chromeos/firmware_layout.h>
-
-#define LINUX_MACH_TYPE MACH_TYPE_WARIO
-#define CONFIG_SYS_BOARD_ODMDATA 0x300d8011 /* lp1, 1GB */
-
-#define CONFIG_SERIAL_MULTI 1
-#define CONFIG_TEGRA2_ENABLE_UARTB 1
-#define CONFIG_TEGRA2_KEYBOARD 1
-#define CONFIG_KEYBOARD 1
-
-#define CONFIG_CONSOLE_MUX 1
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV 1
-
-#define CONFIG_EXTRA_ENV_SETTINGS_BOARD \
- "stdin=serial,tegra-kbc\0" \
- "stdout=serial,lcd\0" \
- "stderr=serial,lcd\0"
-
-#define CONFIG_PLATFORM_EXTRAS_BOARD \
- "mem=384M@0M nvmem=128M@384M mem=512M@512M"
-
-#include <configs/chromeos/tegra2/wario/parts/i2c.h>
-#include <configs/chromeos/tegra2/wario/parts/keyboard.h>
-#include <configs/chromeos/tegra2/wario/parts/lcd.h>
-#include <configs/chromeos/tegra2/wario/parts/mmc.h>
-#include <configs/chromeos/tegra2/wario/parts/pinmux.h>
-#include <configs/chromeos/tegra2/wario/parts/spi.h>
-#include <configs/chromeos/tegra2/wario/parts/uart.h>
-
-#define CONFIG_CHROMEOS_HWID "ARM WARIO BOGUS 0000"
-
-#define CONFIG_CHROMEOS_FIRMWARE_STORAGE_SPI
-#define CONFIG_CHROMEOS_DEFAULT_FIRMWARE_STORAGE_SPI
-
-#endif /*__configs_chromeos_tegra2_wario_common_h__*/
diff --git a/include/configs/chromeos/tegra2/wario/developer.h b/include/configs/chromeos/tegra2/wario/developer.h
deleted file mode 100644
index 21a9ead..0000000
--- a/include/configs/chromeos/tegra2/wario/developer.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_wario_developer_h__
-#define __configs_chromeos_tegra2_wario_developer_h__
-
-#include <configs/chromeos/tegra2/developer.h>
-#include <configs/chromeos/tegra2/wario/common.h>
-
-#include <configs/chromeos/tegra2/wario/parts/usb.h>
-
-#endif /*__configs_chromeos_tegra2_wario_developer_h__*/
diff --git a/include/configs/chromeos/tegra2/wario/flasher.h b/include/configs/chromeos/tegra2/wario/flasher.h
deleted file mode 100644
index 3cfbf46..0000000
--- a/include/configs/chromeos/tegra2/wario/flasher.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_wario_flasher_h__
-#define __configs_chromeos_tegra2_wario_flasher_h__
-
-#include <configs/chromeos/tegra2/flasher.h>
-#include <configs/chromeos/tegra2/wario/common.h>
-
-#endif /*__configs_chromeos_tegra2_wario_flasher_h__*/
diff --git a/include/configs/chromeos/tegra2/wario/normal.h b/include/configs/chromeos/tegra2/wario/normal.h
deleted file mode 100644
index 41f8922..0000000
--- a/include/configs/chromeos/tegra2/wario/normal.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_wario_normal_h__
-#define __configs_chromeos_tegra2_wario_normal_h__
-
-#include <configs/chromeos/tegra2/normal.h>
-#include <configs/chromeos/tegra2/wario/common.h>
-
-#include <configs/chromeos/tegra2/wario/parts/mmc.h>
-
-#endif /*__configs_chromeos_tegra2_wario_normal_h__*/
diff --git a/include/configs/chromeos/tegra2/wario/parts/i2c.h b/include/configs/chromeos/tegra2/wario/parts/i2c.h
deleted file mode 100644
index e51d376..0000000
--- a/include/configs/chromeos/tegra2/wario/parts/i2c.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#define CONFIG_I2CP_PIN_MUX 1
-#define CONFIG_I2C1_PIN_MUX 1
-#define CONFIG_I2C2_PIN_MUX 2
-#define CONFIG_I2C3_PIN_MUX 1
diff --git a/include/configs/chromeos/tegra2/wario/parts/keyboard.h b/include/configs/chromeos/tegra2/wario/parts/keyboard.h
deleted file mode 100644
index 36f04d4..0000000
--- a/include/configs/chromeos/tegra2/wario/parts/keyboard.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#define CONFIG_TEGRA2_KBC_PLAIN_KEYCODES \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0x1b, 0x09, '`', 'a', 'z', '1', 'q', \
- 0, 0, 0, 0, 'd', 'c', '3', 'e', \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 'b', 'g', 't', '5', 'f', 'v', '4', 'r', \
- 0, 0, 0, 0, 's', 'x', '2', 'w', \
- 0, 0, ']', 0, 'k', ',', '8', 'i', \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 'n', 'h', 'y', '6', 'j', 'm', '7', 'u', \
- 0, 0, 0, 0, 0, KEY_SHIFT, 0, KEY_SHIFT, \
- '=', '\'', '[', '-', ';', '/', '0', 'p', \
- 0, 0, 0, 0, 'l', '.', '9', 'o', \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0x08, 0, '\\', '\r', ' ', 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0,
-
-#define CONFIG_TEGRA2_KBC_SHIFT_KEYCODES \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0x1b, 0x09, '~', 'A', 'Z', '!', 'Q', \
- 0, 0, 0, 0, 'D', 'C', '#', 'E', \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 'B', 'G', 'T', '%', 'F', 'V', '$', 'R', \
- 0, 0, 0, 0, 'S', 'X', '@', 'W', \
- 0, 0, '}', 0, 'K', '<', '*', 'I', \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 'N', 'H', 'Y', '^', 'J', 'M', '&', 'U', \
- 0, 0, 0, 0, 0, KEY_SHIFT, 0, KEY_SHIFT, \
- '+', '"', '{', '_', ':', '?', ')', 'P', \
- 0, 0, 0, 0, 'L', '>', '(', 'O', \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0x08, 0, '|', '\r', ' ', 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0,
-
-#define CONFIG_TEGRA2_KBC_FUNCTION_KEYCODES \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0,
diff --git a/include/configs/chromeos/tegra2/wario/parts/lcd.h b/include/configs/chromeos/tegra2/wario/parts/lcd.h
deleted file mode 100644
index 8929587..0000000
--- a/include/configs/chromeos/tegra2/wario/parts/lcd.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#define CONFIG_LCD_vl_col 1280
-#define CONFIG_LCD_vl_row 800
-
-#define TEGRA_GPIO_INIT_LCD TEGRA_GPIO_INIT_LCD_CHROMEOS_1
-#define TEGRA_CLOCK_INIT_LCD TEGRA_CLOCK_INIT_LCD_CHROMEOS_1
-#define TEGRA_RESOURCE_LCD TEGRA_RESOURCE_LCD_CHROMEOS_1
-#define TEGRA_PANEL_MODE TEGRA_PANEL_MODE_CHROMEOS_1
diff --git a/include/configs/chromeos/tegra2/wario/parts/mmc.h b/include/configs/chromeos/tegra2/wario/parts/mmc.h
deleted file mode 100644
index a38de79..0000000
--- a/include/configs/chromeos/tegra2/wario/parts/mmc.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-/* Define this if device is always on EMMC4 controller and no Card Detect pin */
-#define CONFIG_TEGRA2_EMMC4_ALWAYS_INSERTED 1
-#define CONFIG_TEGRA2_EMMC4_IS_HS 1 /* only HS parts used */
-
-#define MMC_DEV_INSTANCES 2
-#define NvEmmcx_0 NvEmmc4
-#define NvEmmcx_1 NvEmmc3
-#define NvEmmcx_2 0
-#define NvEmmcx_3 0
diff --git a/include/configs/chromeos/tegra2/wario/parts/pinmux.h b/include/configs/chromeos/tegra2/wario/parts/pinmux.h
deleted file mode 100644
index 528698d..0000000
--- a/include/configs/chromeos/tegra2/wario/parts/pinmux.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#define CONFIG_TEGRA2_PINMUX \
- CONFIG_TEGRA2_PINMUX_DISPLAY_CROS_1
diff --git a/include/configs/chromeos/tegra2/wario/parts/spi.h b/include/configs/chromeos/tegra2/wario/parts/spi.h
deleted file mode 100644
index bea68fd..0000000
--- a/include/configs/chromeos/tegra2/wario/parts/spi.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#define CONFIG_TEGRA2_SPI
-#define CONFIG_SPI_FLASH
-#define CONFIG_SPI_FLASH_WINBOND
-#define CONFIG_SPI_FLASH_SLOW_READ
-#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
-#define CONFIG_CMD_SPI
-#define CONFIG_CMD_SF
diff --git a/include/configs/chromeos/tegra2/wario/parts/uart.h b/include/configs/chromeos/tegra2/wario/parts/uart.h
deleted file mode 100644
index 680330b..0000000
--- a/include/configs/chromeos/tegra2/wario/parts/uart.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#define CONFIG_SYS_NS16550_COM1 NV_ADDRESS_MAP_APB_UARTB_BASE
diff --git a/include/configs/chromeos/tegra2/wario/parts/usb.h b/include/configs/chromeos/tegra2/wario/parts/usb.h
deleted file mode 100644
index e2b1573..0000000
--- a/include/configs/chromeos/tegra2/wario/parts/usb.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-/* To set base address of USB controller */
-#define NvUSBx_0 USB_EHCI_TEGRA_BASE_ADDR_USB3
-#define NvUSBx_1 USB_EHCI_TEGRA_BASE_ADDR_USB1
-#define NvUSBx_2 0
-#define NvUSBx_3 0
-
-/*
- * USB1 takes 3 ms to clear Port Reset bit after issuing a Port Reset.
- * The expected time is 2 ms. Please refer to page 28 of EHCI 1.0 specification.
- */
-#define CONFIG_USB_RESET_CLEARED_MS 3 * 1000
diff --git a/include/configs/chromeos/tegra2/wario/recovery.h b/include/configs/chromeos/tegra2/wario/recovery.h
deleted file mode 100644
index 5d4766d..0000000
--- a/include/configs/chromeos/tegra2/wario/recovery.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_wario_recovery_h__
-#define __configs_chromeos_tegra2_wario_recovery_h__
-
-#include <configs/chromeos/tegra2/recovery.h>
-#include <configs/chromeos/tegra2/wario/common.h>
-
-#define CONFIG_BOOTCOMMAND \
- "run usb1_boot ; " \
- "run mmc1_boot ; " \
- "run mmc0_boot"
-
-#include <configs/chromeos/tegra2/wario/parts/usb.h>
-
-#endif /*__configs_chromeos_tegra2_wario_recovery_h__*/
diff --git a/include/configs/chromeos/tegra2/wario/stub.h b/include/configs/chromeos/tegra2/wario/stub.h
deleted file mode 100644
index aa09467..0000000
--- a/include/configs/chromeos/tegra2/wario/stub.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __configs_chromeos_tegra2_wario_stub_h__
-#define __configs_chromeos_tegra2_wario_stub_h__
-
-#include <configs/chromeos/tegra2/stub.h>
-#include <configs/chromeos/tegra2/wario/common.h>
-
-#endif /*__configs_chromeos_tegra2_wario_stub_h__*/
diff --git a/tools/Makefile b/tools/Makefile
index b2e73b2..fa41aff 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -144,6 +144,9 @@
-DTEXT_BASE=$(TEXT_BASE) -DUSE_HOSTCC \
-D__KERNEL_STRICT_NAMES
+ifdef CROS_CONFIG_PATH
+HOSTCPPFLAGS += -I$(CROS_CONFIG_PATH)
+endif
all: $(obj).depend $(BINS) $(LOGO-y) subdirs
