Merge git://git.denx.de/u-boot-mpc85xx

This commit is contained in:
Tom Rini 2016-12-04 13:55:15 -05:00
commit 194eded14c
107 changed files with 276 additions and 227 deletions

View file

@ -1273,7 +1273,6 @@ CONFIG_FSL_I2C_CUSTOM_FDR
CONFIG_FSL_IFC
CONFIG_FSL_IIM
CONFIG_FSL_ISBC_KEY_EXT
CONFIG_FSL_LAW
CONFIG_FSL_LAYERSCAPE
CONFIG_FSL_LBC
CONFIG_FSL_LINFLEXUART
@ -4475,7 +4474,6 @@ CONFIG_SYS_CBSIZE
CONFIG_SYS_CCCR
CONFIG_SYS_CCI400_ADDR
CONFIG_SYS_CCSRBAR
CONFIG_SYS_CCSRBAR_DEFAULT
CONFIG_SYS_CCSRBAR_PHYS
CONFIG_SYS_CCSRBAR_PHYS_HIGH
CONFIG_SYS_CCSRBAR_PHYS_LOW
@ -5506,7 +5504,6 @@ CONFIG_SYS_FSL_NI_SIZE
CONFIG_SYS_FSL_NO_SERDES
CONFIG_SYS_FSL_NUM_CC_PLL
CONFIG_SYS_FSL_NUM_CC_PLLS
CONFIG_SYS_FSL_NUM_LAWS
CONFIG_SYS_FSL_OCRAM_BASE
CONFIG_SYS_FSL_OCRAM_SIZE
CONFIG_SYS_FSL_OTHER_DDR_NUM_CTRLS