Skip to content
Snippets Groups Projects
Commit 38b189fe authored by Wolfgang Denk's avatar Wolfgang Denk
Browse files

Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx

parents 0207fefa dd6c910a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 39 additions and 53 deletions
board/atum8548/tlb.c
+ 1
− 1
View file @ 38b189fe
...@@ -82,7 +82,7 @@ struct fsl_e_tlb_entry tlb_table[] = { ...@@ -82,7 +82,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
* 0xe210_0000 1M PCI2 IO * 0xe210_0000 1M PCI2 IO
* 0xe300_0000 1M PCIe IO * 0xe300_0000 1M PCIe IO
*/ */
SET_TLB_ENTRY(1, CFG_CCSRBAR, CFG_CCSRBAR, SET_TLB_ENTRY(1, CFG_CCSRBAR, CFG_CCSRBAR_PHYS,
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
0, 5, BOOKE_PAGESZ_64M, 1), 0, 5, BOOKE_PAGESZ_64M, 1),
}; };
......
board/freescale/common/Makefile
+ 10
− 2
View file @ 38b189fe
...@@ -29,10 +29,18 @@ endif ...@@ -29,10 +29,18 @@ endif
LIB = $(obj)lib$(VENDOR).a LIB = $(obj)lib$(VENDOR).a
COBJS-${CONFIG_PQ_MDS_PIB} += pq-mds-pib.o COBJS-${CONFIG_FSL_CADMUS} += cadmus.o
COBJS-${CONFIG_ID_EEPROM} += sys_eeprom.o COBJS-${CONFIG_FSL_CDS_EEPROM} += cds_eeprom.o
COBJS-${CONFIG_FSL_VIA} += cds_via.o
COBJS-${CONFIG_FSL_DIU_FB} += fsl_diu_fb.o fsl_logo_bmp.o COBJS-${CONFIG_FSL_DIU_FB} += fsl_diu_fb.o fsl_logo_bmp.o
COBJS-${CONFIG_FSL_PIXIS} += pixis.o COBJS-${CONFIG_FSL_PIXIS} += pixis.o
COBJS-${CONFIG_PQ_MDS_PIB} += pq-mds-pib.o
COBJS-${CONFIG_ID_EEPROM} += sys_eeprom.o
COBJS-${CONFIG_MPC8541CDS} += cds_pci_ft.o
COBJS-${CONFIG_MPC8548CDS} += cds_pci_ft.o
COBJS-${CONFIG_MPC8555CDS} += cds_pci_ft.o
SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS-y)) OBJS := $(addprefix $(obj),$(COBJS-y))
......
board/freescale/common/via.c → board/freescale/common/cds_via.c
+ 0
− 0
View file @ 38b189fe
File moved
board/freescale/mpc8540ads/tlb.c
+ 1
− 1
View file @ 38b189fe
...@@ -87,7 +87,7 @@ struct fsl_e_tlb_entry tlb_table[] = { ...@@ -87,7 +87,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
* 0xe000_0000 1M CCSRBAR * 0xe000_0000 1M CCSRBAR
* 0xe200_0000 16M PCI1 IO * 0xe200_0000 16M PCI1 IO
*/ */
SET_TLB_ENTRY(1, CFG_CCSRBAR, CFG_CCSRBAR, SET_TLB_ENTRY(1, CFG_CCSRBAR, CFG_CCSRBAR_PHYS,
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
0, 5, BOOKE_PAGESZ_64M, 1), 0, 5, BOOKE_PAGESZ_64M, 1),
......
board/freescale/mpc8541cds/Makefile
+ 6
− 11
View file @ 38b189fe
...@@ -23,21 +23,16 @@ ...@@ -23,21 +23,16 @@
# #
include $(TOPDIR)/config.mk include $(TOPDIR)/config.mk
ifneq ($(OBJTREE),$(SRCTREE))
$(shell mkdir -p $(obj)../common)
endif
LIB = $(obj)lib$(BOARD).a LIB = $(obj)lib$(BOARD).a
COBJS := $(BOARD).o law.o tlb.o \ COBJS-y += $(BOARD).o
../common/cadmus.o \ COBJS-y += law.o
../common/eeprom.o \ COBJS-y += tlb.o
../common/ft_board.o \
../common/via.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS)) OBJS := $(addprefix $(obj),$(COBJS-y))
SOBJS := $(addprefix $(obj),$(SOBJS)) SOBJS := $(addprefix $(obj),$(SOBJS-y))
$(LIB): $(obj).depend $(OBJS) $(SOBJS) $(LIB): $(obj).depend $(OBJS) $(SOBJS)
$(AR) $(ARFLAGS) $@ $(OBJS) $(AR) $(ARFLAGS) $@ $(OBJS)
......
board/freescale/mpc8541cds/tlb.c
+ 1
− 1
View file @ 38b189fe
...@@ -88,7 +88,7 @@ struct fsl_e_tlb_entry tlb_table[] = { ...@@ -88,7 +88,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
* 0xe200_0000 16M PCI1 IO * 0xe200_0000 16M PCI1 IO
* 0xe300_0000 16M PCI2 IO * 0xe300_0000 16M PCI2 IO
*/ */
SET_TLB_ENTRY(1, CFG_CCSRBAR, CFG_CCSRBAR, SET_TLB_ENTRY(1, CFG_CCSRBAR, CFG_CCSRBAR_PHYS,
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
0, 5, BOOKE_PAGESZ_64M, 1), 0, 5, BOOKE_PAGESZ_64M, 1),
......
board/freescale/mpc8544ds/tlb.c
+ 1
− 1
View file @ 38b189fe
...@@ -75,7 +75,7 @@ struct fsl_e_tlb_entry tlb_table[] = { ...@@ -75,7 +75,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
* 0xe000_0000 1M CCSRBAR * 0xe000_0000 1M CCSRBAR
* 0xe100_0000 255M PCI IO range * 0xe100_0000 255M PCI IO range
*/ */
SET_TLB_ENTRY(1, CFG_CCSRBAR, CFG_CCSRBAR, SET_TLB_ENTRY(1, CFG_CCSRBAR, CFG_CCSRBAR_PHYS,
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
0, 4, BOOKE_PAGESZ_64M, 1), 0, 4, BOOKE_PAGESZ_64M, 1),
......
board/freescale/mpc8548cds/Makefile
+ 6
− 11
View file @ 38b189fe
...@@ -23,21 +23,16 @@ ...@@ -23,21 +23,16 @@
# #
include $(TOPDIR)/config.mk include $(TOPDIR)/config.mk
ifneq ($(OBJTREE),$(SRCTREE))
$(shell mkdir -p $(obj)../common)
endif
LIB = $(obj)lib$(BOARD).a LIB = $(obj)lib$(BOARD).a
COBJS := $(BOARD).o law.o tlb.o \ COBJS-y += $(BOARD).o
../common/cadmus.o \ COBJS-y += law.o
../common/eeprom.o \ COBJS-y += tlb.o
../common/ft_board.o \
../common/via.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS)) OBJS := $(addprefix $(obj),$(COBJS-y))
SOBJS := $(addprefix $(obj),$(SOBJS)) SOBJS := $(addprefix $(obj),$(SOBJS-y))
$(LIB): $(obj).depend $(OBJS) $(SOBJS) $(LIB): $(obj).depend $(OBJS) $(SOBJS)
$(AR) $(ARFLAGS) $@ $(OBJS) $(AR) $(ARFLAGS) $@ $(OBJS)
......
board/freescale/mpc8548cds/tlb.c
+ 1
− 1
View file @ 38b189fe
...@@ -80,7 +80,7 @@ struct fsl_e_tlb_entry tlb_table[] = { ...@@ -80,7 +80,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
* 0xe210_0000 1M PCI2 IO * 0xe210_0000 1M PCI2 IO
* 0xe300_0000 1M PCIe IO * 0xe300_0000 1M PCIe IO
*/ */
SET_TLB_ENTRY(1, CFG_CCSRBAR, CFG_CCSRBAR, SET_TLB_ENTRY(1, CFG_CCSRBAR, CFG_CCSRBAR_PHYS,
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
0, 5, BOOKE_PAGESZ_64M, 1), 0, 5, BOOKE_PAGESZ_64M, 1),
......
board/freescale/mpc8555cds/Makefile
+ 6
− 11
View file @ 38b189fe
...@@ -23,21 +23,16 @@ ...@@ -23,21 +23,16 @@
# #
include $(TOPDIR)/config.mk include $(TOPDIR)/config.mk
ifneq ($(OBJTREE),$(SRCTREE))
$(shell mkdir -p $(obj)../common)
endif
LIB = $(obj)lib$(BOARD).a LIB = $(obj)lib$(BOARD).a
COBJS := $(BOARD).o law.o tlb.o \ COBJS-y += $(BOARD).o
../common/cadmus.o \ COBJS-y += law.o
../common/eeprom.o \ COBJS-y += tlb.o
../common/ft_board.o \
../common/via.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS)) OBJS := $(addprefix $(obj),$(COBJS-y))
SOBJS := $(addprefix $(obj),$(SOBJS)) SOBJS := $(addprefix $(obj),$(SOBJS-y))
$(LIB): $(obj).depend $(OBJS) $(SOBJS) $(LIB): $(obj).depend $(OBJS) $(SOBJS)
$(AR) $(ARFLAGS) $@ $(OBJS) $(AR) $(ARFLAGS) $@ $(OBJS)
......
board/freescale/mpc8555cds/tlb.c
+ 1
− 1
View file @ 38b189fe
...@@ -88,7 +88,7 @@ struct fsl_e_tlb_entry tlb_table[] = { ...@@ -88,7 +88,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
* 0xe200_0000 16M PCI1 IO * 0xe200_0000 16M PCI1 IO
* 0xe300_0000 16M PCI2 IO * 0xe300_0000 16M PCI2 IO
*/ */
SET_TLB_ENTRY(1, CFG_CCSRBAR, CFG_CCSRBAR, SET_TLB_ENTRY(1, CFG_CCSRBAR, CFG_CCSRBAR_PHYS,
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
0, 5, BOOKE_PAGESZ_64M, 1), 0, 5, BOOKE_PAGESZ_64M, 1),
......
board/freescale/mpc8560ads/tlb.c
+ 1
− 1
View file @ 38b189fe
...@@ -87,7 +87,7 @@ struct fsl_e_tlb_entry tlb_table[] = { ...@@ -87,7 +87,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
* 0xe000_0000 1M CCSRBAR * 0xe000_0000 1M CCSRBAR
* 0xe200_0000 16M PCI1 IO * 0xe200_0000 16M PCI1 IO
*/ */
SET_TLB_ENTRY(1, CFG_CCSRBAR, CFG_CCSRBAR, SET_TLB_ENTRY(1, CFG_CCSRBAR, CFG_CCSRBAR_PHYS,
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
0, 5, BOOKE_PAGESZ_64M, 1), 0, 5, BOOKE_PAGESZ_64M, 1),
......
board/freescale/mpc8568mds/Makefile
+ 0
− 3
View file @ 38b189fe
...@@ -23,9 +23,6 @@ ...@@ -23,9 +23,6 @@
# #
include $(TOPDIR)/config.mk include $(TOPDIR)/config.mk
ifneq ($(OBJTREE),$(SRCTREE))
$(shell mkdir -p $(obj)../common)
endif
LIB = $(obj)lib$(BOARD).a LIB = $(obj)lib$(BOARD).a
......
board/freescale/mpc8568mds/tlb.c
+ 1
− 1
View file @ 38b189fe
...@@ -74,7 +74,7 @@ struct fsl_e_tlb_entry tlb_table[] = { ...@@ -74,7 +74,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
* 0xe200_0000 8M PCI1 IO * 0xe200_0000 8M PCI1 IO
* 0xe280_0000 8M PCIe IO * 0xe280_0000 8M PCIe IO
*/ */
SET_TLB_ENTRY(1, CFG_CCSRBAR, CFG_CCSRBAR, SET_TLB_ENTRY(1, CFG_CCSRBAR, CFG_CCSRBAR_PHYS,
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
0, 3, BOOKE_PAGESZ_64M, 1), 0, 3, BOOKE_PAGESZ_64M, 1),
......
board/freescale/mpc8610hpcd/Makefile
+ 0
− 4
View file @ 38b189fe
...@@ -21,10 +21,6 @@ ...@@ -21,10 +21,6 @@
include $(TOPDIR)/config.mk include $(TOPDIR)/config.mk
ifneq ($(OBJTREE),$(SRCTREE))
$(shell mkdir -p $(obj)../common)
endif
LIB = $(obj)lib$(BOARD).a LIB = $(obj)lib$(BOARD).a
COBJS := $(BOARD).o law.o COBJS := $(BOARD).o law.o
......
board/mpc8540eval/tlb.c
+ 1
− 1
View file @ 38b189fe
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include <asm/mmu.h> #include <asm/mmu.h>
struct fsl_e_tlb_entry tlb_table[] = { struct fsl_e_tlb_entry tlb_table[] = {
SET_TLB_ENTRY(1, CFG_CCSRBAR, CFG_CCSRBAR, SET_TLB_ENTRY(1, CFG_CCSRBAR, CFG_CCSRBAR_PHYS,
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
0, 1, BOOKE_PAGESZ_1M, 1), 0, 1, BOOKE_PAGESZ_1M, 1),
......
board/pm854/tlb.c
+ 1
− 1
View file @ 38b189fe
...@@ -87,7 +87,7 @@ struct fsl_e_tlb_entry tlb_table[] = { ...@@ -87,7 +87,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
* 0xe000_0000 1M CCSRBAR * 0xe000_0000 1M CCSRBAR
* 0xe200_0000 16M PCI1 IO * 0xe200_0000 16M PCI1 IO
*/ */
SET_TLB_ENTRY(1, CFG_CCSRBAR, CFG_CCSRBAR, SET_TLB_ENTRY(1, CFG_CCSRBAR, CFG_CCSRBAR_PHYS,
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
0, 5, BOOKE_PAGESZ_64M, 1), 0, 5, BOOKE_PAGESZ_64M, 1),
......
board/pm856/tlb.c
+ 1
− 1
View file @ 38b189fe
...@@ -87,7 +87,7 @@ struct fsl_e_tlb_entry tlb_table[] = { ...@@ -87,7 +87,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
* 0xe000_0000 1M CCSRBAR * 0xe000_0000 1M CCSRBAR
* 0xe200_0000 16M PCI1 IO * 0xe200_0000 16M PCI1 IO
*/ */
SET_TLB_ENTRY(1, CFG_CCSRBAR, CFG_CCSRBAR, SET_TLB_ENTRY(1, CFG_CCSRBAR, CFG_CCSRBAR_PHYS,
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
0, 5, BOOKE_PAGESZ_64M, 1), 0, 5, BOOKE_PAGESZ_64M, 1),
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment