projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'rpi-next-2020.01' of https://github.com/mbgg/u-boot
[platform/kernel/u-boot.git]
/
include
/
configs
/
colibri_t20.h
diff --git
a/include/configs/colibri_t20.h
b/include/configs/colibri_t20.h
index
d9fd642
..
122294d
100644
(file)
--- a/
include/configs/colibri_t20.h
+++ b/
include/configs/colibri_t20.h
@@
-1,9
+1,8
@@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2012 Lucas Stach
*
* Configuration settings for the Toradex Colibri T20 modules.
/*
* Copyright (C) 2012 Lucas Stach
*
* Configuration settings for the Toradex Colibri T20 modules.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
*/
#ifndef __CONFIG_H
@@
-11,9
+10,6
@@
#include "tegra20-common.h"
#include "tegra20-common.h"
-/* High-level configuration options */
-#define CONFIG_DISPLAY_BOARDINFO_LATE /* Calls show_board_info() */
-
/* Board-specific serial config */
#define CONFIG_TEGRA_ENABLE_UARTA
#define CONFIG_TEGRA_UARTA_SDIO1
/* Board-specific serial config */
#define CONFIG_TEGRA_ENABLE_UARTA
#define CONFIG_TEGRA_UARTA_SDIO1
@@
-21,47
+17,20
@@
#define CONFIG_MACH_TYPE MACH_TYPE_COLIBRI_TEGRA2
#define CONFIG_MACH_TYPE MACH_TYPE_COLIBRI_TEGRA2
-/* I2C */
-#define CONFIG_SYS_I2C_TEGRA
-
-/* USB host support */
-#define CONFIG_USB_EHCI_TEGRA
-#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
-
-/* USB networking support */
-#define CONFIG_USB_HOST_ETHER
-#define CONFIG_USB_ETHER_ASIX
-
/* General networking support */
/* General networking support */
-#define CONFIG_IP_DEFRAG
-#define CONFIG_TFTP_BLOCKSIZE 1536
#define CONFIG_TFTP_TSIZE
/* LCD support */
#define CONFIG_LCD_LOGO
/* NAND support */
#define CONFIG_TFTP_TSIZE
/* LCD support */
#define CONFIG_LCD_LOGO
/* NAND support */
-#define CONFIG_CMD_NAND
#define CONFIG_TEGRA_NAND
#define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_TEGRA_NAND
#define CONFIG_SYS_MAX_NAND_DEVICE 1
-/* Dynamic MTD partition support */
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-#define MTDIDS_DEFAULT "nand0=tegra_nand"
-#define MTDPARTS_DEFAULT "mtdparts=tegra_nand:" \
- "2m(u-boot)ro," \
- "1m(u-boot-env)," \
- "1m(cfgblock)ro," \
- "-(ubi)"
-
/* Environment in NAND, 64K is a bit excessive but erase block is 512K anyway */
/* Environment in NAND, 64K is a bit excessive but erase block is 512K anyway */
-#define CONFIG_ENV_OFFSET (SZ_2M)
-#undef CONFIG_ENV_SIZE /* undef size from tegra20-common.h */
-#define CONFIG_ENV_SIZE (SZ_64K)
#define BOARD_EXTRA_ENV_SETTINGS \
#define BOARD_EXTRA_ENV_SETTINGS \
- "mtdparts=" MTDPARTS_DEFAULT "\0"
+ "mtdparts="
CONFIG_
MTDPARTS_DEFAULT "\0"
/* Increase console I/O buffer size */
#undef CONFIG_SYS_CBSIZE
/* Increase console I/O buffer size */
#undef CONFIG_SYS_CBSIZE
@@
-71,9
+40,6
@@
#undef CONFIG_SYS_BARGSIZE
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#undef CONFIG_SYS_BARGSIZE
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-/* Increase print buffer size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-
/* Increase maximum number of arguments */
#undef CONFIG_SYS_MAXARGS
#define CONFIG_SYS_MAXARGS 32
/* Increase maximum number of arguments */
#undef CONFIG_SYS_MAXARGS
#define CONFIG_SYS_MAXARGS 32