From d5854eb822c9ed03f343dcb2dd67680584e31f06 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 16 Sep 2018 18:22:57 +0100 Subject: tegra: cleanup dangling comments in include/configs There's a number of dangling comments in various tegra configs post migrations of various configs so lets clean them up. Signed-off-by: Peter Robinson Cc: Tom Warren Cc: Stephen Warren Cc: Marcel Ziswiler Cc: Tom Warren Cc: Stephen Warren Cc: Peter.Chubb@data61.csiro.au Cc: Lucas Stach Cc: Stefan Agner Cc: Alban Bedel Cc: Allen Martin Reviewed-by: Marcel Ziswiler Signed-off-by: Tom Warren --- include/configs/apalis-tk1.h | 2 -- include/configs/apalis_t30.h | 4 ---- include/configs/beaver.h | 6 ------ include/configs/cardhu.h | 6 ------ include/configs/cei-tk1-som.h | 6 ------ include/configs/colibri_t20.h | 6 ------ include/configs/colibri_t30.h | 2 -- include/configs/dalmore.h | 4 ---- include/configs/e2220-1170.h | 4 ---- include/configs/harmony.h | 4 ---- include/configs/jetson-tk1.h | 6 ------ include/configs/medcom-wide.h | 2 -- include/configs/nyan-big.h | 4 ---- include/configs/p2371-0000.h | 4 ---- include/configs/p2371-2180.h | 6 ------ include/configs/p2571.h | 4 ---- include/configs/p2771-0000.h | 2 -- include/configs/paz00.h | 2 -- include/configs/plutux.h | 4 ---- include/configs/seaboard.h | 2 -- include/configs/tec-ng.h | 4 ---- include/configs/tec.h | 2 -- include/configs/tegra-common.h | 6 ------ include/configs/tegra210-common.h | 4 ---- include/configs/tegra30-common.h | 4 ---- include/configs/trimslice.h | 6 ------ include/configs/venice2.h | 4 ---- include/configs/ventana.h | 2 -- 28 files changed, 112 deletions(-) (limited to 'include/configs') diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index 667d084611..506a9e4f2f 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -14,8 +14,6 @@ #define CONFIG_ARCH_MISC_INIT -/* High-level configuration options */ - /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h index 646086a956..ac012225a7 100644 --- a/include/configs/apalis_t30.h +++ b/include/configs/apalis_t30.h @@ -12,8 +12,6 @@ #include "tegra30-common.h" -/* High-level configuration options */ - /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE @@ -32,8 +30,6 @@ /* USB host support */ #define CONFIG_USB_EHCI_TEGRA -/* PCI host support */ - /* PCI networking support */ #define CONFIG_E1000_NO_NVM diff --git a/include/configs/beaver.h b/include/configs/beaver.h index 73629ddeb0..8ea583ddfc 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.h @@ -39,12 +39,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ - -/* PCI host support */ - -/* General networking support */ - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index dcb66a6f9a..2ad9320444 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -43,12 +43,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ - -/* PCI host support */ - -/* General networking support */ - #include "tegra-common-post.h" #endif /* __CONFIG_H */ diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h index 14008440da..b595c48263 100644 --- a/include/configs/cei-tk1-som.h +++ b/include/configs/cei-tk1-som.h @@ -38,12 +38,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ - -/* PCI host support */ - -/* General networking support */ - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index 4a18c72a53..c34d6d055c 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -10,8 +10,6 @@ #include "tegra20-common.h" -/* High-level configuration options */ - /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_TEGRA_UARTA_SDIO1 @@ -26,8 +24,6 @@ #define CONFIG_USB_EHCI_TEGRA #define CONFIG_USB_MAX_CONTROLLER_COUNT 3 -/* USB networking support */ - /* General networking support */ #define CONFIG_IP_DEFRAG #define CONFIG_TFTP_BLOCKSIZE 1536 @@ -40,8 +36,6 @@ #define CONFIG_TEGRA_NAND #define CONFIG_SYS_MAX_NAND_DEVICE 1 -/* Dynamic MTD partition support */ - /* 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 */ diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h index 908b3bde3e..6b1a831da9 100644 --- a/include/configs/colibri_t30.h +++ b/include/configs/colibri_t30.h @@ -32,8 +32,6 @@ /* USB host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ - /* General networking support */ #define CONFIG_IP_DEFRAG #define CONFIG_TFTP_BLOCKSIZE 16352 diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h index 9a8b5a7357..afd2dd2f64 100644 --- a/include/configs/dalmore.h +++ b/include/configs/dalmore.h @@ -35,10 +35,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ - -/* General networking support */ - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" diff --git a/include/configs/e2220-1170.h b/include/configs/e2220-1170.h index dd7a01290a..6fe2f66795 100644 --- a/include/configs/e2220-1170.h +++ b/include/configs/e2220-1170.h @@ -33,10 +33,6 @@ /* USB2.0 Host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ - -/* General networking support */ - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" diff --git a/include/configs/harmony.h b/include/configs/harmony.h index fc5ed5b2fd..7365dfeb46 100644 --- a/include/configs/harmony.h +++ b/include/configs/harmony.h @@ -29,16 +29,12 @@ #define CONFIG_TEGRA_NAND #define CONFIG_SYS_MAX_NAND_DEVICE 1 -/* Dynamic MTD partition support */ - /* Environment in NAND (which is 512M), aligned to start of last sector */ #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sector size */ /* USB Host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ - #include "tegra-common-post.h" #endif /* __CONFIG_H */ diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h index 93fcdd6bcc..192d821d4b 100644 --- a/include/configs/jetson-tk1.h +++ b/include/configs/jetson-tk1.h @@ -34,12 +34,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ - -/* PCI host support */ - -/* General networking support */ - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h index b290df5891..88976fed64 100644 --- a/include/configs/medcom-wide.h +++ b/include/configs/medcom-wide.h @@ -28,8 +28,6 @@ /* USB host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ - #include "tegra-common-post.h" #endif /* __CONFIG_H */ diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index dd76829e91..4a0de70733 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -37,10 +37,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ - -/* General networking support */ - #define CONFIG_KEYBOARD #undef CONFIG_LOADADDR diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h index 6654a1b4df..9e22bbb8cf 100644 --- a/include/configs/p2371-0000.h +++ b/include/configs/p2371-0000.h @@ -33,10 +33,6 @@ /* USB2.0 Host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ - -/* General networking support */ - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h index 0e37511daf..76c11ad7a0 100644 --- a/include/configs/p2371-2180.h +++ b/include/configs/p2371-2180.h @@ -33,12 +33,6 @@ /* USB2.0 Host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ - -/* PCI host support */ - -/* General networking support */ - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" diff --git a/include/configs/p2571.h b/include/configs/p2571.h index 1daf49a453..5e34f22618 100644 --- a/include/configs/p2571.h +++ b/include/configs/p2571.h @@ -34,10 +34,6 @@ /* USB2.0 Host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ - -/* General networking support */ - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" diff --git a/include/configs/p2771-0000.h b/include/configs/p2771-0000.h index cfe8d8cbed..e8be81a66c 100644 --- a/include/configs/p2771-0000.h +++ b/include/configs/p2771-0000.h @@ -21,8 +21,6 @@ #define CONFIG_SYS_MMC_ENV_PART 2 #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) -/* PCI host support */ - #define BOARD_EXTRA_ENV_SETTINGS \ "calculated_vars=kernel_addr_r fdt_addr_r scriptaddr pxefile_addr_r " \ "ramdisk_addr_r\0" \ diff --git a/include/configs/paz00.h b/include/configs/paz00.h index 447f99af68..5c52a4e02b 100644 --- a/include/configs/paz00.h +++ b/include/configs/paz00.h @@ -29,8 +29,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ - #include "tegra-common-post.h" #endif /* __CONFIG_H */ diff --git a/include/configs/plutux.h b/include/configs/plutux.h index 125a1f1f43..f61af5ae28 100644 --- a/include/configs/plutux.h +++ b/include/configs/plutux.h @@ -28,10 +28,6 @@ /* USB host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ - -/* General networking support */ - #include "tegra-common-post.h" #endif /* __CONFIG_H */ diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index b8d02f0397..ef3848d6df 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -37,8 +37,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ - /* Enable keyboard */ #define CONFIG_TEGRA_KEYBOARD #define CONFIG_KEYBOARD diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h index dd3e026b14..998e353c5e 100644 --- a/include/configs/tec-ng.h +++ b/include/configs/tec-ng.h @@ -33,10 +33,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ - -/* General networking support */ - /* Tag support */ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/configs/tec.h b/include/configs/tec.h index a40212190a..e40bfb9ba1 100644 --- a/include/configs/tec.h +++ b/include/configs/tec.h @@ -28,8 +28,6 @@ /* USB host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ - #include "tegra-common-post.h" #endif /* __CONFIG_H */ diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index d37e2d79d3..84f671d00c 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -39,15 +39,9 @@ */ #define CONFIG_SYS_MMC_MAX_DEVICE 4 -/* - * select serial console configuration - */ - /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -/* turn on command-line edit/hist/auto */ - /* * Increasing the size of the IO buffer as default nfsargs size is more * than 256 and so it is not possible to edit it diff --git a/include/configs/tegra210-common.h b/include/configs/tegra210-common.h index 16b962db64..1c533118ad 100644 --- a/include/configs/tegra210-common.h +++ b/include/configs/tegra210-common.h @@ -14,10 +14,6 @@ */ #define V_NS16550_CLK 408000000 /* 408MHz (pllp_out0) */ -/*----------------------------------------------------------------------- - * Physical Memory Map - */ - /* Generic Interrupt Controller */ #define CONFIG_GICV2 diff --git a/include/configs/tegra30-common.h b/include/configs/tegra30-common.h index 70964a90ce..2c7a1852ae 100644 --- a/include/configs/tegra30-common.h +++ b/include/configs/tegra30-common.h @@ -18,10 +18,6 @@ */ #define CONFIG_STACKBASE 0x82800000 /* 40MB */ -/*----------------------------------------------------------------------- - * Physical Memory Map - */ - /* * Memory layout for where various images get loaded by boot scripts: * diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h index 427da1c1c2..8972e1738a 100644 --- a/include/configs/trimslice.h +++ b/include/configs/trimslice.h @@ -36,12 +36,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ - -/* PCI host support */ - -/* General networking support */ - #include "tegra-common-post.h" #endif /* __CONFIG_H */ diff --git a/include/configs/venice2.h b/include/configs/venice2.h index e542187efc..8bb74aae1b 100644 --- a/include/configs/venice2.h +++ b/include/configs/venice2.h @@ -34,10 +34,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ - -/* General networking support */ - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" diff --git a/include/configs/ventana.h b/include/configs/ventana.h index 3f9db3303f..7391262b49 100644 --- a/include/configs/ventana.h +++ b/include/configs/ventana.h @@ -27,8 +27,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ - #include "tegra-common-post.h" #endif /* __CONFIG_H */ -- cgit From cba0ae6e49085dba539d223c58d1c203a98689f0 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 16 Sep 2018 18:22:58 +0100 Subject: tegra20: common: fix USB_EHCI_TXFIFO_THRESH value All other Tegra devices that define USB_EHCI_TXFIFO_THRESH use hex representation, fix tegra20 to be the same format. Signed-off-by: Peter Robinson Cc: Tom Warren Cc: Stephen Warren Signed-off-by: Tom Warren --- include/configs/tegra20-common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/configs') diff --git a/include/configs/tegra20-common.h b/include/configs/tegra20-common.h index 7f0a5292c2..3551616cd1 100644 --- a/include/configs/tegra20-common.h +++ b/include/configs/tegra20-common.h @@ -78,7 +78,7 @@ * 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_USB_EHCI_TXFIFO_THRESH 0x10 #define CONFIG_EHCI_IS_TDI #define CONFIG_SYS_NAND_SELF_INIT -- cgit From f16e3115f3b601f121798070b97224b8234d71b7 Mon Sep 17 00:00:00 2001 From: Jonathan Hunter Date: Tue, 12 Feb 2019 16:03:14 +0000 Subject: ARM: tegra: Reserve 32MB for the Linux kernel Booting recently Linux -next kernels on 32-bit Tegra devices has been failing when using the 'multi_v7_defconfig' kenrel configuration because the size of has grown such that it is overwriting the FDT blob. Current Linux -next kernels built with the 'multi_v7_defconfig' have a total size of ~19.5MB (where .text is ~12.5MB, .data is ~6.5MB and .bss is ~0.5MB). Therefore, increase the memory location reserved for the Linux kernel to 32MB from 16MB for 32-bit Tegra devices. This change has been boot tested on Tegra20 Ventana, Tegra30 Cardhu and Tegra124 Jetson TK1 with the Linux next tree (20190212). Signed-off-by: Jonathan Hunter Reviewed-by: Stephen Warren Signed-off-by: Tom Warren --- include/configs/tegra114-common.h | 14 +++++++------- include/configs/tegra124-common.h | 14 +++++++------- include/configs/tegra20-common.h | 14 +++++++------- include/configs/tegra30-common.h | 14 +++++++------- 4 files changed, 28 insertions(+), 28 deletions(-) (limited to 'include/configs') diff --git a/include/configs/tegra114-common.h b/include/configs/tegra114-common.h index ccfc516a82..1aa4412645 100644 --- a/include/configs/tegra114-common.h +++ b/include/configs/tegra114-common.h @@ -15,7 +15,7 @@ /* * Miscellaneous configurable options */ -#define CONFIG_STACKBASE 0x82800000 /* 40MB */ +#define CONFIG_STACKBASE 0x83800000 /* 56MB */ /*----------------------------------------------------------------------- * Physical Memory Map @@ -36,13 +36,13 @@ * should not overlap that area, or the kernel will have to copy itself * somewhere else before decompression. Similarly, the address of any other * data passed to the kernel shouldn't overlap the start of RAM. Pushing - * this up to 16M allows for a sizable kernel to be decompressed below the + * this up to 32M allows for a sizable kernel to be decompressed below the * compressed load address. * - * fdt_addr_r simply shouldn't overlap anything else. Choosing 32M allows for - * the compressed kernel to be up to 16M too. + * fdt_addr_r simply shouldn't overlap anything else. Choosing 48M allows for + * the compressed kernel to be up to 32M too. * - * ramdisk_addr_r simply shouldn't overlap anything else. Choosing 33M allows + * ramdisk_addr_r simply shouldn't overlap anything else. Choosing 49M allows * for the FDT/DTB to be up to 1M, which is hopefully plenty. */ #define CONFIG_LOADADDR 0x81000000 @@ -50,8 +50,8 @@ "scriptaddr=0x90000000\0" \ "pxefile_addr_r=0x90100000\0" \ "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ - "fdt_addr_r=0x82000000\0" \ - "ramdisk_addr_r=0x82100000\0" + "fdt_addr_r=0x83000000\0" \ + "ramdisk_addr_r=0x83100000\0" /* Defines for SPL */ #define CONFIG_SPL_TEXT_BASE 0x80108000 diff --git a/include/configs/tegra124-common.h b/include/configs/tegra124-common.h index b275f795a3..3530684164 100644 --- a/include/configs/tegra124-common.h +++ b/include/configs/tegra124-common.h @@ -17,7 +17,7 @@ /* * Miscellaneous configurable options */ -#define CONFIG_STACKBASE 0x82800000 /* 40MB */ +#define CONFIG_STACKBASE 0x83800000 /* 56MB */ /*----------------------------------------------------------------------- * Physical Memory Map @@ -38,13 +38,13 @@ * should not overlap that area, or the kernel will have to copy itself * somewhere else before decompression. Similarly, the address of any other * data passed to the kernel shouldn't overlap the start of RAM. Pushing - * this up to 16M allows for a sizable kernel to be decompressed below the + * this up to 32M allows for a sizable kernel to be decompressed below the * compressed load address. * - * fdt_addr_r simply shouldn't overlap anything else. Choosing 32M allows for - * the compressed kernel to be up to 16M too. + * fdt_addr_r simply shouldn't overlap anything else. Choosing 48M allows for + * the compressed kernel to be up to 32M too. * - * ramdisk_addr_r simply shouldn't overlap anything else. Choosing 33M allows + * ramdisk_addr_r simply shouldn't overlap anything else. Choosing 49M allows * for the FDT/DTB to be up to 1M, which is hopefully plenty. */ #define CONFIG_LOADADDR 0x81000000 @@ -52,8 +52,8 @@ "scriptaddr=0x90000000\0" \ "pxefile_addr_r=0x90100000\0" \ "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ - "fdt_addr_r=0x82000000\0" \ - "ramdisk_addr_r=0x82100000\0" + "fdt_addr_r=0x83000000\0" \ + "ramdisk_addr_r=0x83100000\0" /* Defines for SPL */ #define CONFIG_SPL_TEXT_BASE 0x80108000 diff --git a/include/configs/tegra20-common.h b/include/configs/tegra20-common.h index 3551616cd1..e58477e289 100644 --- a/include/configs/tegra20-common.h +++ b/include/configs/tegra20-common.h @@ -16,7 +16,7 @@ /* * Miscellaneous configurable options */ -#define CONFIG_STACKBASE 0x02800000 /* 40MB */ +#define CONFIG_STACKBASE 0x03800000 /* 56MB */ /*----------------------------------------------------------------------- * Physical Memory Map @@ -37,13 +37,13 @@ * should not overlap that area, or the kernel will have to copy itself * somewhere else before decompression. Similarly, the address of any other * data passed to the kernel shouldn't overlap the start of RAM. Pushing - * this up to 16M allows for a sizable kernel to be decompressed below the + * this up to 32M allows for a sizable kernel to be decompressed below the * compressed load address. * - * fdt_addr_r simply shouldn't overlap anything else. Choosing 32M allows for - * the compressed kernel to be up to 16M too. + * fdt_addr_r simply shouldn't overlap anything else. Choosing 48M allows for + * the compressed kernel to be up to 32M too. * - * ramdisk_addr_r simply shouldn't overlap anything else. Choosing 33M allows + * ramdisk_addr_r simply shouldn't overlap anything else. Choosing 49M allows * for the FDT/DTB to be up to 1M, which is hopefully plenty. */ #define CONFIG_LOADADDR 0x01000000 @@ -51,8 +51,8 @@ "scriptaddr=0x10000000\0" \ "pxefile_addr_r=0x10100000\0" \ "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ - "fdt_addr_r=0x02000000\0" \ - "ramdisk_addr_r=0x02100000\0" + "fdt_addr_r=0x03000000\0" \ + "ramdisk_addr_r=0x03100000\0" /* Defines for SPL */ #define CONFIG_SPL_TEXT_BASE 0x00108000 diff --git a/include/configs/tegra30-common.h b/include/configs/tegra30-common.h index 2c7a1852ae..2d8948d9d9 100644 --- a/include/configs/tegra30-common.h +++ b/include/configs/tegra30-common.h @@ -16,7 +16,7 @@ /* * Miscellaneous configurable options */ -#define CONFIG_STACKBASE 0x82800000 /* 40MB */ +#define CONFIG_STACKBASE 0x83800000 /* 56MB */ /* * Memory layout for where various images get loaded by boot scripts: @@ -33,13 +33,13 @@ * should not overlap that area, or the kernel will have to copy itself * somewhere else before decompression. Similarly, the address of any other * data passed to the kernel shouldn't overlap the start of RAM. Pushing - * this up to 16M allows for a sizable kernel to be decompressed below the + * this up to 32M allows for a sizable kernel to be decompressed below the * compressed load address. * - * fdt_addr_r simply shouldn't overlap anything else. Choosing 32M allows for - * the compressed kernel to be up to 16M too. + * fdt_addr_r simply shouldn't overlap anything else. Choosing 48M allows for + * the compressed kernel to be up to 32M too. * - * ramdisk_addr_r simply shouldn't overlap anything else. Choosing 33M allows + * ramdisk_addr_r simply shouldn't overlap anything else. Choosing 49M allows * for the FDT/DTB to be up to 1M, which is hopefully plenty. */ #define CONFIG_LOADADDR 0x81000000 @@ -47,8 +47,8 @@ "scriptaddr=0x90000000\0" \ "pxefile_addr_r=0x90100000\0" \ "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ - "fdt_addr_r=0x82000000\0" \ - "ramdisk_addr_r=0x82100000\0" + "fdt_addr_r=0x83000000\0" \ + "ramdisk_addr_r=0x83100000\0" /* Defines for SPL */ #define CONFIG_SPL_TEXT_BASE 0x80108000 -- cgit From 02253d4d12667b99dc7538b0427353a8c8221514 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 20 Feb 2019 12:17:26 +0000 Subject: Kconfig: tegra: Migrate SYS_I2C_TEGRA Migrate SYS_I2C_TEGRA from headers to Kconfig Signed-off-by: Peter Robinson Cc: Tom Warren Cc: Stephen Warren Cc: Heiko Schocher Cc: Marcel Ziswiler Cc: Peter.Chubb@data61.csiro.au Cc: Lucas Stach Cc: Stefan Agner Cc: Alban Bedel Cc: Allen Martin Signed-off-by: Tom Warren --- include/configs/apalis-tk1.h | 3 --- include/configs/apalis_t30.h | 3 --- include/configs/beaver.h | 3 --- include/configs/cardhu.h | 3 --- include/configs/cei-tk1-som.h | 3 --- include/configs/colibri_t20.h | 3 --- include/configs/colibri_t30.h | 3 --- include/configs/dalmore.h | 3 --- include/configs/e2220-1170.h | 3 --- include/configs/jetson-tk1.h | 3 --- include/configs/nyan-big.h | 3 --- include/configs/p2371-0000.h | 3 --- include/configs/p2371-2180.h | 3 --- include/configs/p2571.h | 3 --- include/configs/p2771-0000.h | 3 --- include/configs/seaboard.h | 3 --- include/configs/tec-ng.h | 3 --- include/configs/trimslice.h | 3 --- include/configs/venice2.h | 3 --- 19 files changed, 57 deletions(-) (limited to 'include/configs') diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index 506a9e4f2f..05c958a8fe 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -18,9 +18,6 @@ #define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* SD/MMC support */ #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h index ac012225a7..254a3c4aa8 100644 --- a/include/configs/apalis_t30.h +++ b/include/configs/apalis_t30.h @@ -18,9 +18,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_APALIS_T30 -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in eMMC, before config block at the end of 1st "boot sector" */ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE + \ CONFIG_TDX_CFG_BLOCK_OFFSET) diff --git a/include/configs/beaver.h b/include/configs/beaver.h index 8ea583ddfc..6d17750f40 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.h @@ -22,9 +22,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_BEAVER -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index 2ad9320444..65c7d2c39b 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -26,9 +26,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_CARDHU -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h index b595c48263..7ba17a6fd6 100644 --- a/include/configs/cei-tk1-som.h +++ b/include/configs/cei-tk1-som.h @@ -22,9 +22,6 @@ #define CONFIG_TEGRA_ENABLE_UARTD #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index c34d6d055c..26d8e8eb0e 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -17,9 +17,6 @@ #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 diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h index 6b1a831da9..c933705de7 100644 --- a/include/configs/colibri_t30.h +++ b/include/configs/colibri_t30.h @@ -20,9 +20,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_COLIBRI_T30 -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in eMMC, before config block at the end of 1st "boot sector" */ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE + \ CONFIG_TDX_CFG_BLOCK_OFFSET) diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h index afd2dd2f64..1ae523409c 100644 --- a/include/configs/dalmore.h +++ b/include/configs/dalmore.h @@ -19,9 +19,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_DALMORE -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 diff --git a/include/configs/e2220-1170.h b/include/configs/e2220-1170.h index 6fe2f66795..1e917345d8 100644 --- a/include/configs/e2220-1170.h +++ b/include/configs/e2220-1170.h @@ -17,9 +17,6 @@ /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h index 192d821d4b..f93c81a6d4 100644 --- a/include/configs/jetson-tk1.h +++ b/include/configs/jetson-tk1.h @@ -18,9 +18,6 @@ #define CONFIG_TEGRA_ENABLE_UARTD #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index 4a0de70733..bb98201190 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -18,9 +18,6 @@ #define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h index 9e22bbb8cf..5843cc00eb 100644 --- a/include/configs/p2371-0000.h +++ b/include/configs/p2371-0000.h @@ -17,9 +17,6 @@ /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h index 76c11ad7a0..3486cc8117 100644 --- a/include/configs/p2371-2180.h +++ b/include/configs/p2371-2180.h @@ -17,9 +17,6 @@ /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 diff --git a/include/configs/p2571.h b/include/configs/p2571.h index 5e34f22618..a64b6c42a5 100644 --- a/include/configs/p2571.h +++ b/include/configs/p2571.h @@ -18,9 +18,6 @@ #define CONFIG_SERIAL_MULTI #define CONFIG_TEGRA_ENABLE_UARTA -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 diff --git a/include/configs/p2771-0000.h b/include/configs/p2771-0000.h index e8be81a66c..e546c1d73f 100644 --- a/include/configs/p2771-0000.h +++ b/include/configs/p2771-0000.h @@ -13,9 +13,6 @@ /* High-level configuration options */ #define CONFIG_TEGRA_BOARD_STRING "NVIDIA P2771-0000" -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index ef3848d6df..53d9546dc6 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -26,9 +26,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_SEABOARD -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h index 998e353c5e..205c90ff2f 100644 --- a/include/configs/tec-ng.h +++ b/include/configs/tec-ng.h @@ -16,9 +16,6 @@ #define CONFIG_TEGRA_ENABLE_UARTD #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h index 8972e1738a..4e2b57c1a4 100644 --- a/include/configs/trimslice.h +++ b/include/configs/trimslice.h @@ -23,9 +23,6 @@ /* SPI */ #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in SPI */ #define CONFIG_ENV_SPI_MAX_HZ 48000000 #define CONFIG_ENV_SPI_MODE SPI_MODE_0 diff --git a/include/configs/venice2.h b/include/configs/venice2.h index 8bb74aae1b..72e6d8a5db 100644 --- a/include/configs/venice2.h +++ b/include/configs/venice2.h @@ -18,9 +18,6 @@ #define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 -- cgit From 747fed56d3876d7de89959f9a927901e02166151 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 20 Feb 2019 12:17:27 +0000 Subject: Kconfig: tegra: Migrate USB_EHCI_TEGRA Migrate USB_EHCI_TEGRA from headers to Kconfig Signed-off-by: Peter Robinson Cc: Tom Warren Cc: Stephen Warren Cc: Marek Vasut Cc: Marcel Ziswiler Cc: Peter.Chubb@data61.csiro.au Cc: Lucas Stach Cc: Stefan Agner Cc: Alban Bedel Cc: Allen Martin Signed-off-by: Tom Warren --- include/configs/apalis-tk1.h | 3 --- include/configs/apalis_t30.h | 3 --- include/configs/beaver.h | 3 --- include/configs/cardhu.h | 3 --- include/configs/cei-tk1-som.h | 3 --- include/configs/colibri_t20.h | 4 ---- include/configs/colibri_t30.h | 3 --- include/configs/dalmore.h | 3 --- include/configs/e2220-1170.h | 3 --- include/configs/harmony.h | 3 --- include/configs/jetson-tk1.h | 3 --- include/configs/medcom-wide.h | 3 --- include/configs/nyan-big.h | 3 --- include/configs/p2371-0000.h | 3 --- include/configs/p2371-2180.h | 3 --- include/configs/p2571.h | 3 --- include/configs/paz00.h | 3 --- include/configs/plutux.h | 3 --- include/configs/seaboard.h | 3 --- include/configs/tec-ng.h | 3 --- include/configs/tec.h | 3 --- include/configs/trimslice.h | 3 --- include/configs/venice2.h | 3 --- include/configs/ventana.h | 3 --- 24 files changed, 73 deletions(-) (limited to 'include/configs') diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index 05c958a8fe..1d296ba51a 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -27,9 +27,6 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 1 -/* USB host support */ -#define CONFIG_USB_EHCI_TEGRA - /* PCI host support */ #undef CONFIG_PCI_SCAN_SHOW diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h index 254a3c4aa8..77a5968cc2 100644 --- a/include/configs/apalis_t30.h +++ b/include/configs/apalis_t30.h @@ -24,9 +24,6 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 1 -/* USB host support */ -#define CONFIG_USB_EHCI_TEGRA - /* PCI networking support */ #define CONFIG_E1000_NO_NVM diff --git a/include/configs/beaver.h b/include/configs/beaver.h index 6d17750f40..a11a800a71 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.h @@ -33,9 +33,6 @@ #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20) -/* USB Host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index 65c7d2c39b..6b2553c73b 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -37,9 +37,6 @@ #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20) -/* USB Host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-post.h" #endif /* __CONFIG_H */ diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h index 7ba17a6fd6..74305f1b6e 100644 --- a/include/configs/cei-tk1-som.h +++ b/include/configs/cei-tk1-som.h @@ -32,9 +32,6 @@ #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20) -/* USB Host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index 26d8e8eb0e..6c4e9d4154 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -17,10 +17,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_COLIBRI_TEGRA2 -/* USB host support */ -#define CONFIG_USB_EHCI_TEGRA -#define CONFIG_USB_MAX_CONTROLLER_COUNT 3 - /* General networking support */ #define CONFIG_IP_DEFRAG #define CONFIG_TFTP_BLOCKSIZE 1536 diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h index c933705de7..7ece00e646 100644 --- a/include/configs/colibri_t30.h +++ b/include/configs/colibri_t30.h @@ -26,9 +26,6 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 1 -/* USB host support */ -#define CONFIG_USB_EHCI_TEGRA - /* General networking support */ #define CONFIG_IP_DEFRAG #define CONFIG_TFTP_BLOCKSIZE 16352 diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h index 1ae523409c..9b25a9d59d 100644 --- a/include/configs/dalmore.h +++ b/include/configs/dalmore.h @@ -29,9 +29,6 @@ #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20) -/* USB Host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" diff --git a/include/configs/e2220-1170.h b/include/configs/e2220-1170.h index 1e917345d8..30c0c7fee7 100644 --- a/include/configs/e2220-1170.h +++ b/include/configs/e2220-1170.h @@ -27,9 +27,6 @@ #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20) -/* USB2.0 Host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" diff --git a/include/configs/harmony.h b/include/configs/harmony.h index 7365dfeb46..f873cea265 100644 --- a/include/configs/harmony.h +++ b/include/configs/harmony.h @@ -32,9 +32,6 @@ /* Environment in NAND (which is 512M), aligned to start of last sector */ #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sector size */ -/* USB Host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-post.h" #endif /* __CONFIG_H */ diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h index f93c81a6d4..7b2c7947e9 100644 --- a/include/configs/jetson-tk1.h +++ b/include/configs/jetson-tk1.h @@ -28,9 +28,6 @@ #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20) -/* USB Host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h index 88976fed64..d212a7f680 100644 --- a/include/configs/medcom-wide.h +++ b/include/configs/medcom-wide.h @@ -25,9 +25,6 @@ /* Environment in NAND, aligned to start of last sector */ #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sectors */ -/* USB host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-post.h" #endif /* __CONFIG_H */ diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index bb98201190..3d43839e41 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -31,9 +31,6 @@ #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20) -/* USB Host support */ -#define CONFIG_USB_EHCI_TEGRA - #define CONFIG_KEYBOARD #undef CONFIG_LOADADDR diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h index 5843cc00eb..59866997e3 100644 --- a/include/configs/p2371-0000.h +++ b/include/configs/p2371-0000.h @@ -27,9 +27,6 @@ #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20) -/* USB2.0 Host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h index 3486cc8117..c97b226027 100644 --- a/include/configs/p2371-2180.h +++ b/include/configs/p2371-2180.h @@ -27,9 +27,6 @@ #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20) -/* USB2.0 Host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" diff --git a/include/configs/p2571.h b/include/configs/p2571.h index a64b6c42a5..4920896e9c 100644 --- a/include/configs/p2571.h +++ b/include/configs/p2571.h @@ -28,9 +28,6 @@ #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20) -/* USB2.0 Host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" diff --git a/include/configs/paz00.h b/include/configs/paz00.h index 5c52a4e02b..b76958c36d 100644 --- a/include/configs/paz00.h +++ b/include/configs/paz00.h @@ -26,9 +26,6 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 -/* USB Host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-post.h" #endif /* __CONFIG_H */ diff --git a/include/configs/plutux.h b/include/configs/plutux.h index f61af5ae28..43856bad2c 100644 --- a/include/configs/plutux.h +++ b/include/configs/plutux.h @@ -25,9 +25,6 @@ /* Environment in NAND, aligned to start of last sector */ #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sectors */ -/* USB host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-post.h" #endif /* __CONFIG_H */ diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index 53d9546dc6..c5fa9cc420 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -31,9 +31,6 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 -/* USB Host support */ -#define CONFIG_USB_EHCI_TEGRA - /* Enable keyboard */ #define CONFIG_TEGRA_KEYBOARD #define CONFIG_KEYBOARD diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h index 205c90ff2f..85914ec695 100644 --- a/include/configs/tec-ng.h +++ b/include/configs/tec-ng.h @@ -27,9 +27,6 @@ #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20) -/* USB Host support */ -#define CONFIG_USB_EHCI_TEGRA - /* Tag support */ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/configs/tec.h b/include/configs/tec.h index e40bfb9ba1..907c8d5e23 100644 --- a/include/configs/tec.h +++ b/include/configs/tec.h @@ -25,9 +25,6 @@ /* Environment in NAND, aligned to start of last sector */ #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sectors */ -/* USB host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-post.h" #endif /* __CONFIG_H */ diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h index 4e2b57c1a4..4b1eb7b1c8 100644 --- a/include/configs/trimslice.h +++ b/include/configs/trimslice.h @@ -30,9 +30,6 @@ /* 1MiB flash, environment located as high as possible */ #define CONFIG_ENV_OFFSET (SZ_1M - CONFIG_ENV_SIZE) -/* USB Host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-post.h" #endif /* __CONFIG_H */ diff --git a/include/configs/venice2.h b/include/configs/venice2.h index 72e6d8a5db..a86ae212f2 100644 --- a/include/configs/venice2.h +++ b/include/configs/venice2.h @@ -28,9 +28,6 @@ #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20) -/* USB Host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" diff --git a/include/configs/ventana.h b/include/configs/ventana.h index 7391262b49..09f90db1f5 100644 --- a/include/configs/ventana.h +++ b/include/configs/ventana.h @@ -24,9 +24,6 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 -/* USB Host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-post.h" #endif /* __CONFIG_H */ -- cgit From 06b070e323e1fa45107c769ea8d88f09d7ffe56e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 20 Feb 2019 12:17:28 +0000 Subject: Kconfig: tegra: Migrate TEGRA_KEYBOARD Migrate TEGRA_KEYBOARD from headers to Kconfig, only the seaboard uses it but we drop CONFIG_KEYBOARD as the driver doesn't use the legacy drv_keyboard_init. Signed-off-by: Peter Robinson Cc: Tom Warren Cc: Stephen Warren Signed-off-by: Tom Warren --- include/configs/seaboard.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'include/configs') diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index c5fa9cc420..5df013b0b3 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -31,10 +31,6 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 -/* Enable keyboard */ -#define CONFIG_TEGRA_KEYBOARD -#define CONFIG_KEYBOARD - /* NAND support */ #define CONFIG_TEGRA_NAND -- cgit From 146680003a776d9217d6d351ca4186f416a77226 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 20 Feb 2019 12:17:29 +0000 Subject: nyan-big: drop CONFIG_KEYBOARD The CONFIG_KEYBOARD does nothing as it's legacy and unused so just drop it from the config. Signed-off-by: Peter Robinson Cc: Tom Warren Cc: Stephen Warren Cc: Allen Martin Signed-off-by: Tom Warren --- include/configs/nyan-big.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include/configs') diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index 3d43839e41..933f84028f 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -31,8 +31,6 @@ #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20) -#define CONFIG_KEYBOARD - #undef CONFIG_LOADADDR #define CONFIG_LOADADDR 0x82408000 -- cgit