summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-04-18 16:16:01 -0400
committerTom Rini <trini@ti.com>2013-04-18 16:16:01 -0400
commit17dcbfb0876385b13739b1b1f2026edc8163b629 (patch)
tree5faa5949a895040398e70f6e8ef81dc9da88557e /include
parent669dfc2ed8d853d6bcdcafa1de6aca22929465e5 (diff)
parentf2e8a87305a55652488af140adcf65b1e688f287 (diff)
downloadu-boot-imx-17dcbfb0876385b13739b1b1f2026edc8163b629.zip
u-boot-imx-17dcbfb0876385b13739b1b1f2026edc8163b629.tar.gz
u-boot-imx-17dcbfb0876385b13739b1b1f2026edc8163b629.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-arm into HEAD
Quick manual fixup to merge the USB boot related defines and TPM related defines. Conflicts: include/configs/exynos5250-dt.h Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/beaver.h76
-rw-r--r--include/configs/exynos5250-dt.h5
-rw-r--r--include/configs/medcom-wide.h21
-rw-r--r--include/configs/plutux.h18
-rw-r--r--include/configs/tec.h10
-rw-r--r--include/configs/tegra-common.h2
6 files changed, 109 insertions, 23 deletions
diff --git a/include/configs/beaver.h b/include/configs/beaver.h
new file mode 100644
index 0000000..058da4f
--- /dev/null
+++ b/include/configs/beaver.h
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2013, NVIDIA CORPORATION. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#include <asm/sizes.h>
+
+#include "tegra30-common.h"
+
+/* Enable fdt support for Beaver. Flash the image in u-boot-dtb.bin */
+#define CONFIG_DEFAULT_DEVICE_TREE tegra30-beaver
+#define CONFIG_OF_CONTROL
+#define CONFIG_OF_SEPARATE
+
+/* High-level configuration options */
+#define V_PROMPT "Tegra30 (Beaver) # "
+#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Beaver"
+
+/* Board-specific serial config */
+#define CONFIG_SERIAL_MULTI
+#define CONFIG_TEGRA_ENABLE_UARTA
+#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
+
+#define MACH_TYPE_BEAVER 4597 /* not yet in mach-types.h */
+#define CONFIG_MACH_TYPE MACH_TYPE_BEAVER
+
+#define CONFIG_BOARD_EARLY_INIT_F
+
+/* I2C */
+#define CONFIG_TEGRA_I2C
+#define CONFIG_SYS_I2C_INIT_BOARD
+#define CONFIG_I2C_MULTI_BUS
+#define CONFIG_SYS_MAX_I2C_BUS TEGRA_I2C_NUM_CONTROLLERS
+#define CONFIG_SYS_I2C_SPEED 100000
+#define CONFIG_CMD_I2C
+
+/* SD/MMC */
+#define CONFIG_MMC
+#define CONFIG_GENERIC_MMC
+#define CONFIG_TEGRA_MMC
+#define CONFIG_CMD_MMC
+
+/* Environment in eMMC, at the end of 2nd "boot sector" */
+#define CONFIG_ENV_IS_IN_MMC
+#define CONFIG_ENV_OFFSET ((1024 * 1024) - CONFIG_ENV_SIZE)
+#define CONFIG_SYS_MMC_ENV_DEV 0
+#define CONFIG_SYS_MMC_ENV_PART 2
+
+/* SPI */
+#define CONFIG_TEGRA20_SLINK
+#define CONFIG_TEGRA_SLINK_CTRLS 6
+#define CONFIG_SPI_FLASH
+#define CONFIG_SPI_FLASH_WINBOND
+#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
+#define CONFIG_SF_DEFAULT_SPEED 24000000
+#define CONFIG_CMD_SPI
+#define CONFIG_CMD_SF
+#define CONFIG_SPI_FLASH_SIZE (4 << 20)
+
+#include "tegra-common-post.h"
+
+#endif /* __CONFIG_H */
diff --git a/include/configs/exynos5250-dt.h b/include/configs/exynos5250-dt.h
index 020048a..8a82892 100644
--- a/include/configs/exynos5250-dt.h
+++ b/include/configs/exynos5250-dt.h
@@ -134,6 +134,11 @@
#define CONFIG_USB_EHCI_EXYNOS
#define CONFIG_USB_STORAGE
+/* USB boot mode */
+#define EXYNOS_COPY_USB_FNPTR_ADDR 0x02020070
+#define EXYNOS_USB_SECONDARY_BOOT 0xfeed0002
+#define EXYNOS_IRAM_SECONDARY_BASE 0x02020018
+
/* TPM */
#define CONFIG_TPM
#define CONFIG_CMD_TPM
diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h
index 57a50d7..eebf385 100644
--- a/include/configs/medcom-wide.h
+++ b/include/configs/medcom-wide.h
@@ -44,14 +44,21 @@
#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_LATE_INIT
-#define CONFIG_ENV_IS_NOWHERE
-
/* SD/MMC */
#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA_MMC
#define CONFIG_CMD_MMC
+/* NAND support */
+#define CONFIG_CMD_NAND
+#define CONFIG_TEGRA_NAND
+#define CONFIG_SYS_MAX_NAND_DEVICE 1
+
+/* Environment in NAND, aligned to start of last sector */
+#define CONFIG_ENV_IS_IN_NAND
+#define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sectors */
+
/* USB host support */
#define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_TEGRA
@@ -66,13 +73,6 @@
#define CONFIG_CMD_NET
#define CONFIG_CMD_DHCP
-#define CONFIG_FIT
-
-#define CONFIG_BOOTCOMMAND \
- "mmc rescan;" \
- "ext2load mmc 0 0x17000000 /boot/uImage;" \
- "bootm"
-
/* LCD support */
#define CONFIG_LCD
#define CONFIG_PWM_TEGRA
@@ -80,6 +80,9 @@
#define LCD_BPP LCD_COLOR16
#define CONFIG_SYS_WHITE_ON_BLACK
+/* support the new (FDT-based) image format */
+#define CONFIG_FIT
+
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/plutux.h b/include/configs/plutux.h
index 4cfe88a..25ee83a 100644
--- a/include/configs/plutux.h
+++ b/include/configs/plutux.h
@@ -42,8 +42,7 @@
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
#define CONFIG_BOARD_EARLY_INIT_F
-
-#define CONFIG_ENV_IS_NOWHERE
+#define CONFIG_BOARD_LATE_INIT
/* SD/MMC */
#define CONFIG_MMC
@@ -51,6 +50,15 @@
#define CONFIG_TEGRA_MMC
#define CONFIG_CMD_MMC
+/* NAND support */
+#define CONFIG_CMD_NAND
+#define CONFIG_TEGRA_NAND
+#define CONFIG_SYS_MAX_NAND_DEVICE 1
+
+/* Environment in NAND, aligned to start of last sector */
+#define CONFIG_ENV_IS_IN_NAND
+#define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sectors */
+
/* USB host support */
#define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_TEGRA
@@ -65,13 +73,9 @@
#define CONFIG_CMD_NET
#define CONFIG_CMD_DHCP
+/* support the new (FDT-based) image format */
#define CONFIG_FIT
-#define CONFIG_BOOTCOMMAND \
- "mmc rescan;" \
- "ext2load mmc 0 0x17000000 /boot/uImage;" \
- "bootm"
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/tec.h b/include/configs/tec.h
index f90f5c7..f280cc0 100644
--- a/include/configs/tec.h
+++ b/include/configs/tec.h
@@ -73,13 +73,6 @@
#define CONFIG_CMD_NET
#define CONFIG_CMD_DHCP
-#define CONFIG_FIT
-
-#define CONFIG_BOOTCOMMAND \
- "mmc rescan;" \
- "ext2load mmc 0 0x17000000 /boot/uImage;" \
- "bootm"
-
/* LCD support */
#define CONFIG_LCD
#define CONFIG_PWM_TEGRA
@@ -87,6 +80,9 @@
#define LCD_BPP LCD_COLOR16
#define CONFIG_SYS_WHITE_ON_BLACK
+/* support the new (FDT-based) image format */
+#define CONFIG_FIT
+
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index e9241b8..cb9e7c3 100644
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -168,7 +168,9 @@
#define CONFIG_SPL_GPIO_SUPPORT
#define CONFIG_SYS_GENERIC_BOARD
+
/* Misc utility code */
#define CONFIG_BOUNCE_BUFFER
+#define CONFIG_CRC32_VERIFY
#endif /* _TEGRA_COMMON_H_ */