summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-04-05 09:09:56 -0400
committerTom Rini <trini@konsulko.com>2019-04-05 09:09:56 -0400
commit0e62d5b2abb69ddc9e58215e2d8dfa5d33996b8a (patch)
tree5933319386cfe347915108d4cc95a5f117ff3edb /include
parent0e708abcbba13aea6b57ecb7f0f1042eb29d0dce (diff)
parentda60b4301c77fdc0ce16a4f6fb6dc04b69b6282c (diff)
Merge tag 'u-boot-imx-20190405' of git://git.denx.de/u-boot-imx
Fixes for 2019.04 - fix bashism for MX8 - fix ethernet for MX53 - fix docs for i.MX8
Diffstat (limited to 'include')
-rw-r--r--include/configs/bg0900.h4
-rw-r--r--include/configs/dreamplug.h3
-rw-r--r--include/configs/ds109.h3
-rw-r--r--include/configs/km/km_arm.h3
-rw-r--r--include/configs/kp_imx53.h2
5 files changed, 0 insertions, 15 deletions
diff --git a/include/configs/bg0900.h b/include/configs/bg0900.h
index 832dbbaafc..c05b06a417 100644
--- a/include/configs/bg0900.h
+++ b/include/configs/bg0900.h
@@ -19,10 +19,6 @@
#define CONFIG_FEC_MXC
#endif
-/* SPI FLASH */
-#ifdef CONFIG_CMD_SF
-#endif
-
/* Boot Linux */
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_BOOTCOMMAND "bootm"
diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h
index 28bda14c3d..f7f9141dd0 100644
--- a/include/configs/dreamplug.h
+++ b/include/configs/dreamplug.h
@@ -34,9 +34,6 @@
#define CONFIG_ENV_SECT_SIZE 0x10000 /* 64k */
#endif
-#ifdef CONFIG_CMD_SF
-#endif
-
/*
* max 4k env size is enough, but in case of nand
* it has to be rounded to sector size
diff --git a/include/configs/ds109.h b/include/configs/ds109.h
index 07367cfef0..31abb4bc85 100644
--- a/include/configs/ds109.h
+++ b/include/configs/ds109.h
@@ -37,9 +37,6 @@
#define CONFIG_ENV_SECT_SIZE 0x10000 /* 64k */
#endif
-#ifdef CONFIG_CMD_SF
-#endif
-
/*
* max 4k env size is enough, but in case of nand
* it has to be rounded to sector size
diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index a2e9cf1fa5..8a00ac015a 100644
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -34,9 +34,6 @@
/* SPI NOR Flash default params, used by sf commands */
-#if defined CONFIG_KM_ENV_IS_IN_SPI_NOR
-#endif
-
/* Reserve 4 MB for malloc */
#define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024)
diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h
index 080eec47ca..3ea75fa120 100644
--- a/include/configs/kp_imx53.h
+++ b/include/configs/kp_imx53.h
@@ -20,8 +20,6 @@
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
#define CONFIG_SYS_FSL_ESDHC_NUM 1
-/* Eth Configs */
-
/* USB Configs */
#define CONFIG_USB_EHCI_MX5
#define CONFIG_MXC_USB_PORT 1