[U-Boot-Users] [PATCH13] microblaze - xupv2p

[Grant Likely]

On 8/30/07, Michal Simek <Monstr at seznam.cz> wrote:
> DESC: clean Makefile, change configuration setting
>
> why? because XupV2p use new emac drivers
>
> Signed-off-by: Michal Simek <monstr at monstr.eu>
>
>
> diff --git a/board/xilinx/xupv2p/Makefile b/board/xilinx/xupv2p/Makefile
> index 9ab5633..99e7047 100644
> --- a/board/xilinx/xupv2p/Makefile
> +++ b/board/xilinx/xupv2p/Makefile
> @@ -22,32 +22,17 @@
>  #
>
>  include $(TOPDIR)/config.mk
> -ifneq ($(OBJTREE),$(SRCTREE))
> -$(shell mkdir -p $(obj)../common)
> -$(shell mkdir -p $(obj)../xilinx_enet)
> -endif
> -
> -INCS           := -I../common -I../xilinx_enet
> -CFLAGS         += $(INCS)
> -HOST_CFLAGS    += $(INCS)
>
>  LIB    = $(obj)lib$(BOARD).a
>
> -COBJS  = $(BOARD).o \
> -         ../xilinx_enet/emac_adapter.o  ../xilinx_enet/xemac.o \
> -         ../xilinx_enet/xemac_options.o ../xilinx_enet/xemac_polled.o \
> -         ../xilinx_enet/xemac_intr.o ../xilinx_enet/xemac_g.o \
> -         ../xilinx_enet/xemac_intr_dma.o ../common/xipif_v1_23_b.o \
> -         ../common/xbasic_types.o ../common/xdma_channel.o \
> -         ../common/xdma_channel_sg.o ../common/xpacket_fifo_v1_00_b.o \
> -         ../common/xversion.o \
> +COBJS  = $(BOARD).o
>
>  SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
>  OBJS   := $(addprefix $(obj),$(COBJS))
>  SOBJS  := $(addprefix $(obj),$(SOBJS))
>
> -$(LIB):        $(OBJS) $(SOBJS)
> -       $(AR) $(ARFLAGS) $@ $^
> +$(LIB):        $(obj).depend $(OBJS)
> +       $(AR) $(ARFLAGS) $@ $(OBJS)
>
>  clean:
>         rm -f $(SOBJS) $(OBJS)
> diff --git a/board/xilinx/xupv2p/config.mk b/board/xilinx/xupv2p/config.mk
> index c07b0b3..eedfb24 100644
> --- a/board/xilinx/xupv2p/config.mk
> +++ b/board/xilinx/xupv2p/config.mk
> @@ -25,8 +25,8 @@
>  # Version: Xilinx EDK 8.2.02 EDK_Im_Sp2.4
>  #
>
> -TEXT_BASE = 0x38000000
> +TEXT_BASE = 0x30000000
>
> +PLATFORM_CPPFLAGS += -mxl-pattern-compare
>  PLATFORM_CPPFLAGS += -mno-xl-soft-mul
> -PLATFORM_CPPFLAGS += -mno-xl-soft-div
> -PLATFORM_CPPFLAGS += -mxl-barrel-shift
> +PLATFORM_CPPFLAGS += -mcpu=v5.00.c
> diff --git a/board/xilinx/xupv2p/xparameters.h b/board/xilinx/xupv2p/xparameters.h
> index a96c693..0bb7a80 100644
> --- a/board/xilinx/xupv2p/xparameters.h
> +++ b/board/xilinx/xupv2p/xparameters.h
> @@ -28,17 +28,24 @@
>  /* System Clock Frequency */
>  #define XILINX_CLOCK_FREQ      100000000
>
> +/* Microblaze is microblaze_0 */
> +#define XILINX_USE_MSR_INSTR   1
> +#define XILINX_PVR     0
> +#define XILINX_FSL_NUMBER      0
> +
>  /* Interrupt controller is opb_intc_0 */
>  #define XILINX_INTC_BASEADDR   0x41200000
> -#define XILINX_INTC_NUM_INTR_INPUTS    11
> +#define XILINX_INTC_NUM_INTR_INPUTS    7
>
>  /* Timer pheriphery is opb_timer_1 */
>  #define XILINX_TIMER_BASEADDR  0x41c00000
> -#define XILINX_TIMER_IRQ       1
> +#define XILINX_TIMER_IRQ       0
>
>  /* Uart pheriphery is RS232_Uart_1 */
> -#define XILINX_UART_BASEADDR   0x40600000
> -#define XILINX_UART_BAUDRATE   115200
> +#define XILINX_UARTLITE_BASEADDR       0x40600000
> +#define XILINX_UARTLITE_BAUDRATE       115200
> +
> +/* IIC doesn't exist */
>
>  /* GPIO is LEDs_4Bit*/
>  #define XILINX_GPIO_BASEADDR   0x40000000
> @@ -51,14 +58,10 @@
>
>  /* Sysace Controller is SysACE_CompactFlash */
>  #define XILINX_SYSACE_BASEADDR 0x41800000
> -#define XILINX_SYSACE_HIGHADDR 0x4180ffff
>  #define XILINX_SYSACE_MEM_WIDTH        16
>
>  /* Ethernet controller is Ethernet_MAC */
> -#define XPAR_XEMAC_NUM_INSTANCES       1
> -#define XPAR_OPB_ETHERNET_0_DEVICE_ID  0
> -#define XPAR_OPB_ETHERNET_0_BASEADDR   0x40c00000
> -#define XPAR_OPB_ETHERNET_0_HIGHADDR   0x40c0ffff
> -#define XPAR_OPB_ETHERNET_0_DMA_PRESENT        1
> -#define XPAR_OPB_ETHERNET_0_ERR_COUNT_EXIST    1
> -#define XPAR_OPB_ETHERNET_0_MII_EXIST  1
> +#define XILINX_EMAC_BASEADDR   0x40c00000
> +#define XILINX_EMAC_DMA_PRESENT        3
> +#define XILINX_EMAC_HALF_DUPLEX_EXIST  1
> +#define XILINX_EMAC_MII_EXIST  1
> diff --git a/include/configs/xupv2p.h b/include/configs/xupv2p.h
> index 35001d7..006a132 100644
> --- a/include/configs/xupv2p.h
> +++ b/include/configs/xupv2p.h
> @@ -31,13 +31,34 @@
>  #define        CONFIG_XUPV2P           1
>
>  /* uart */
> -#define        CONFIG_SERIAL_BASE      XILINX_UART_BASEADDR
> -#define        CONFIG_BAUDRATE         XILINX_UART_BAUDRATE
> +#ifdef XILINX_UARTLITE_BASEADDR
> +#define        XILINX_UARTLITE

CONFIG_XILINX_UARTLITE

> +#define        CONFIG_SERIAL_BASE      XILINX_UARTLITE_BASEADDR
> +#define        CONFIG_BAUDRATE         XILINX_UARTLITE_BAUDRATE
>  #define        CFG_BAUDRATE_TABLE      { CONFIG_BAUDRATE }
> +#else
> +#ifdef XILINX_UART16550_BASEADDR
> +#define CFG_NS16550
> +#define CFG_NS16550_SERIAL
> +#define CFG_NS16550_REG_SIZE   4
> +#define CONFIG_CONS_INDEX      1
> +#define CFG_NS16550_COM1       XILINX_UART16550_BASEADDR
> +#define CFG_NS16550_CLK                XILINX_UART16550_CLOCK_HZ
> +
> +#define        CONFIG_BAUDRATE         115200
> +#define        CFG_BAUDRATE_TABLE      { 9600, 115200 }
> +#endif
> +#endif
>
>  /* ethernet */
> -#define CONFIG_EMAC    1
> -#define XPAR_EMAC_0_DEVICE_ID  XPAR_XEMAC_NUM_INSTANCES
> +#ifdef XILINX_EMAC_BASEADDR
> +#define XILINX_EMAC    1

CONFIG_XLINX_EMAC

> +#else
> +#ifdef XILINX_EMACLITE_BASEADDR
> +#define XILINX_EMACLITE        1

CONFIG_XILINX_EMACLITE... but you get the picture.  :-)

Cheers,
g.


-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
grant.likely at secretlab.ca
(403) 399-0195