diff options
| author | Tom Rini <trini@konsulko.com> | 2017-06-14 18:53:03 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-06-14 18:53:03 -0400 |
| commit | 4f58002013ba1e89eb8fda015ff495bd37cd4016 (patch) | |
| tree | 983b76b4bbf34116a0ec21444e790ff6bdaacfd5 /configs | |
| parent | 11b66916e0e03c8930cdce72e68e8e06ff313b48 (diff) | |
| parent | 1079af4817b562e176259c2beadb67ef0d046d91 (diff) | |
Merge git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/MPC8536DS_36BIT_defconfig | 1 | ||||
| -rw-r--r-- | configs/MPC8536DS_defconfig | 1 | ||||
| -rw-r--r-- | configs/MPC8540ADS_defconfig | 15 | ||||
| -rw-r--r-- | configs/MPC8544DS_defconfig | 1 | ||||
| -rw-r--r-- | configs/MPC8548CDS_36BIT_defconfig | 1 | ||||
| -rw-r--r-- | configs/MPC8548CDS_defconfig | 1 | ||||
| -rw-r--r-- | configs/MPC8560ADS_defconfig | 14 | ||||
| -rw-r--r-- | configs/MPC8568MDS_defconfig | 1 | ||||
| -rw-r--r-- | configs/MPC8569MDS_ATM_defconfig | 1 | ||||
| -rw-r--r-- | configs/MPC8569MDS_defconfig | 1 | ||||
| -rw-r--r-- | configs/MPC8641HPCN_defconfig | 1 |
11 files changed, 9 insertions, 29 deletions
diff --git a/configs/MPC8536DS_36BIT_defconfig b/configs/MPC8536DS_36BIT_defconfig index 6c3a044e614..7f29246bfc7 100644 --- a/configs/MPC8536DS_36BIT_defconfig +++ b/configs/MPC8536DS_36BIT_defconfig @@ -10,6 +10,7 @@ CONFIG_BOOTDELAY=10 # CONFIG_CONSOLE_MUX is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_DHCP=y CONFIG_CMD_MMC=y CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/MPC8536DS_defconfig b/configs/MPC8536DS_defconfig index 589ad9edbc3..36162e14c93 100644 --- a/configs/MPC8536DS_defconfig +++ b/configs/MPC8536DS_defconfig @@ -9,6 +9,7 @@ CONFIG_BOOTDELAY=10 # CONFIG_CONSOLE_MUX is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_DHCP=y CONFIG_CMD_MMC=y CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/MPC8540ADS_defconfig b/configs/MPC8540ADS_defconfig deleted file mode 100644 index cef9c11209f..00000000000 --- a/configs/MPC8540ADS_defconfig +++ /dev/null @@ -1,15 +0,0 @@ -CONFIG_PPC=y -CONFIG_MPC85xx=y -# CONFIG_CMD_ERRATA is not set -CONFIG_TARGET_MPC8540ADS=y -CONFIG_OF_BOARD_SETUP=y -CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_BOOTDELAY=10 -CONFIG_HUSH_PARSER=y -CONFIG_CMD_I2C=y -CONFIG_CMD_PING=y -# CONFIG_CMD_HASH is not set -# CONFIG_MMC is not set -CONFIG_MTD_NOR_FLASH=y -CONFIG_SYS_NS16550=y -CONFIG_OF_LIBFDT=y diff --git a/configs/MPC8544DS_defconfig b/configs/MPC8544DS_defconfig index 1798622e340..4e2b8e62116 100644 --- a/configs/MPC8544DS_defconfig +++ b/configs/MPC8544DS_defconfig @@ -8,6 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=10 # CONFIG_CONSOLE_MUX is not set CONFIG_HUSH_PARSER=y +CONFIG_CMD_DHCP=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_MII=y diff --git a/configs/MPC8548CDS_36BIT_defconfig b/configs/MPC8548CDS_36BIT_defconfig index 277043e4a05..b9a6240df4c 100644 --- a/configs/MPC8548CDS_36BIT_defconfig +++ b/configs/MPC8548CDS_36BIT_defconfig @@ -7,6 +7,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y +CONFIG_CMD_DHCP=y CONFIG_CMD_I2C=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/configs/MPC8548CDS_defconfig b/configs/MPC8548CDS_defconfig index a0c2f00652b..83d28abf399 100644 --- a/configs/MPC8548CDS_defconfig +++ b/configs/MPC8548CDS_defconfig @@ -6,6 +6,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y +CONFIG_CMD_DHCP=y CONFIG_CMD_I2C=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/configs/MPC8560ADS_defconfig b/configs/MPC8560ADS_defconfig deleted file mode 100644 index 2ceab0d4ee4..00000000000 --- a/configs/MPC8560ADS_defconfig +++ /dev/null @@ -1,14 +0,0 @@ -CONFIG_PPC=y -CONFIG_MPC85xx=y -# CONFIG_CMD_ERRATA is not set -CONFIG_TARGET_MPC8560ADS=y -CONFIG_OF_BOARD_SETUP=y -CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_BOOTDELAY=10 -CONFIG_HUSH_PARSER=y -CONFIG_CMD_I2C=y -CONFIG_CMD_PING=y -# CONFIG_CMD_HASH is not set -# CONFIG_MMC is not set -CONFIG_MTD_NOR_FLASH=y -CONFIG_OF_LIBFDT=y diff --git a/configs/MPC8568MDS_defconfig b/configs/MPC8568MDS_defconfig index c41712f490a..904568df849 100644 --- a/configs/MPC8568MDS_defconfig +++ b/configs/MPC8568MDS_defconfig @@ -7,6 +7,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=10 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_DHCP=y CONFIG_CMD_I2C=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/configs/MPC8569MDS_ATM_defconfig b/configs/MPC8569MDS_ATM_defconfig index cbbf4bc1eed..16c5a4e83eb 100644 --- a/configs/MPC8569MDS_ATM_defconfig +++ b/configs/MPC8569MDS_ATM_defconfig @@ -8,6 +8,7 @@ CONFIG_SYS_EXTRA_OPTIONS="ATM" CONFIG_BOOTDELAY=10 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_DHCP=y CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y CONFIG_CMD_MII=y diff --git a/configs/MPC8569MDS_defconfig b/configs/MPC8569MDS_defconfig index 45c4f547dba..384a06467d8 100644 --- a/configs/MPC8569MDS_defconfig +++ b/configs/MPC8569MDS_defconfig @@ -7,6 +7,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=10 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_DHCP=y CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y CONFIG_CMD_MII=y diff --git a/configs/MPC8641HPCN_defconfig b/configs/MPC8641HPCN_defconfig index 64fe8e430d6..aa2a4645474 100644 --- a/configs/MPC8641HPCN_defconfig +++ b/configs/MPC8641HPCN_defconfig @@ -10,6 +10,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_DOS_PARTITION=y |