Merge tag 'next-20220328' of https://source.denx.de/u-boot/custodians/u-boot-video...

[platform/kernel/u-boot.git] / include / configs / tqma6.h

diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 895cd03..c11e5c1 100644 (file)
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -2,13 +2,15 @@
 /*
  * Copyright (C) 2013, 2014, 2017 Markus Niebel <Markus.Niebel@tq-group.com>
  *
- * Configuration settings for the TQ Systems TQMa6<Q,D,DL,S> module.
+ * Configuration settings for the TQ-Systems TQMa6<Q,D,DL,S> module.
  */
 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
 #include <linux/kconfig.h>
+#include <linux/stringify.h>
+
 /* SPL */
 /* #if defined(CONFIG_SPL_BUILD) */
 /* common IMX6 SPL configuration */
@@ -34,17 +36,12 @@
 
 /* I2C Configs */
 #define CONFIG_I2C_MULTI_BUS
-#define CONFIG_SYS_I2C_SPEED           100000
 
 /* I2C EEPROM (M24C64) */
-#define CONFIG_SYS_I2C_EEPROM_ADDR                     0x50
-#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN                 2
 #define CONFIG_SYS_I2C_EEPROM_PAGE_WRITE_BITS          5 /* 32 Bytes */
 #define CONFIG_SYS_I2C_EEPROM_PAGE_WRITE_DELAY_MS      20
 
 #if !defined(CONFIG_DM_PMIC)
-#define CONFIG_POWER
-#define CONFIG_POWER_I2C
 #define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
 #define TQMA6_PFUZE100_I2C_BUS         2
@@ -58,22 +55,14 @@
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET       /* For OTG port */
 
-#define CONFIG_FEC_MXC
 #define IMX_FEC_BASE                   ENET_BASE_ADDR
 
-#define CONFIG_ARP_TIMEOUT             200UL
-
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 2 * SZ_1M)
-
 #if defined(CONFIG_TQMA6X_MMC_BOOT)
 
 #define TQMA6_UBOOT_OFFSET             SZ_1K
 #define TQMA6_UBOOT_SECTOR_START       0x2
 #define TQMA6_UBOOT_SECTOR_COUNT       0x7fe
 
-#define CONFIG_SYS_MMC_ENV_DEV         0
-
 #define TQMA6_FDT_OFFSET               (2 * SZ_1M)
 #define TQMA6_FDT_SECTOR_START         0x1000
 #define TQMA6_FDT_SECTOR_COUNT         0x800
@@ -128,9 +117,6 @@
                "fi; fi; "                                                     \
                "setenv filesize; setenv blkc \0"                              \
 
-#define CONFIG_BOOTCOMMAND \
-       "run mmcboot; run netboot; run panicboot"
-
 #elif defined(CONFIG_TQMA6X_SPI_BOOT)
 
 #define TQMA6_UBOOT_OFFSET             0x400
@@ -214,11 +200,7 @@
                "setexpr offset ${fdt_start} * "                               \
                        __stringify(TQMA6_SPI_FLASH_SECTOR_SIZE)"; "           \
                "sf read ${fdt_addr} ${offset} ${size}; "                      \
-               "setenv size ; setenv offset\0"                                \
-
-#define CONFIG_BOOTCOMMAND                                                     \
-       "sf probe; run mmcboot; run netboot; run panicboot"                    \
-
+               "setenv size ; setenv offset\0"
 #else
 
 #error "need to define boot source"