From 222dcb789cf861f01a455cfde35bb47a7b1c8ff4 Mon Sep 17 00:00:00 2001 From: Gatsby Van Date: Tue, 12 Mar 2024 17:23:00 +0800 Subject: [PATCH] update bsp: add MPC --- .../bsp/ps7_cortexa9_0/include/xparameters.h | 27 +++++++++---------- .../libsrc/gpio_v4_4/src/xgpio_g.c | 8 +++--- df_datalink_ge/bsp/system.mss | 18 +++++-------- df_datalink_ge/build/makefile | 4 +-- .../build/src/{systembus => mpc}/subdir.mk | 14 +++++----- 5 files changed, 31 insertions(+), 40 deletions(-) rename df_datalink_ge/build/src/{systembus => mpc}/subdir.mk (77%) diff --git a/df_datalink_ge/bsp/ps7_cortexa9_0/include/xparameters.h b/df_datalink_ge/bsp/ps7_cortexa9_0/include/xparameters.h index a0d32f0..c3f5b8f 100644 --- a/df_datalink_ge/bsp/ps7_cortexa9_0/include/xparameters.h +++ b/df_datalink_ge/bsp/ps7_cortexa9_0/include/xparameters.h @@ -359,20 +359,20 @@ /* Definitions for driver GPIO */ #define XPAR_XGPIO_NUM_INSTANCES 1 -/* Definitions for peripheral CONFIG_GPIO */ -#define XPAR_CONFIG_GPIO_BASEADDR 0x41200000 -#define XPAR_CONFIG_GPIO_HIGHADDR 0x4120FFFF -#define XPAR_CONFIG_GPIO_DEVICE_ID 0 -#define XPAR_CONFIG_GPIO_INTERRUPT_PRESENT 0 -#define XPAR_CONFIG_GPIO_IS_DUAL 1 +/* Definitions for peripheral MPC_GPIO */ +#define XPAR_MPC_GPIO_BASEADDR 0x41200000 +#define XPAR_MPC_GPIO_HIGHADDR 0x4120FFFF +#define XPAR_MPC_GPIO_DEVICE_ID 0 +#define XPAR_MPC_GPIO_INTERRUPT_PRESENT 0 +#define XPAR_MPC_GPIO_IS_DUAL 1 /******************************************************************/ -/* Canonical definitions for peripheral CONFIG_GPIO */ +/* Canonical definitions for peripheral MPC_GPIO */ #define XPAR_GPIO_0_BASEADDR 0x41200000 #define XPAR_GPIO_0_HIGHADDR 0x4120FFFF -#define XPAR_GPIO_0_DEVICE_ID XPAR_CONFIG_GPIO_DEVICE_ID +#define XPAR_GPIO_0_DEVICE_ID XPAR_MPC_GPIO_DEVICE_ID #define XPAR_GPIO_0_INTERRUPT_PRESENT 0 #define XPAR_GPIO_0_IS_DUAL 1 @@ -425,17 +425,14 @@ /* Definitions for Fabric interrupts connected to ps7_scugic_0 */ #define XPAR_FABRIC_PHY_IRQ_INTR 61U -#define XPAR_FABRIC_FRAME_UART_0_RX_INTR_INTR 62U -#define XPAR_FABRIC_FRAME_UART_0_TX_INTR_INTR 63U -#define XPAR_FABRIC_MPC_IRQ_INTR 64U -#define XPAR_FABRIC_PHY_5MS_INTR 65U -#define XPAR_FABRIC_PHY_5MS_DELAY_2MS_INTR 66U +#define XPAR_FABRIC_PHY_5MS_INTR 62U +#define XPAR_FABRIC_PHY_5MS_DELAY_2MS_INTR 63U +#define XPAR_FABRIC_MPC_RX_IRQ_INTR 64U +#define XPAR_FABRIC_MPC_TX_IRQ_INTR 65U /******************************************************************/ /* Canonical definitions for Fabric interrupts connected to ps7_scugic_0 */ -#define XPAR_FABRIC_FRAME_UART_0_RX_INTR_VEC_ID XPAR_FABRIC_FRAME_UART_0_RX_INTR_INTR -#define XPAR_FABRIC_FRAME_UART_0_TX_INTR_VEC_ID XPAR_FABRIC_FRAME_UART_0_TX_INTR_INTR /******************************************************************/ diff --git a/df_datalink_ge/bsp/ps7_cortexa9_0/libsrc/gpio_v4_4/src/xgpio_g.c b/df_datalink_ge/bsp/ps7_cortexa9_0/libsrc/gpio_v4_4/src/xgpio_g.c index 5b22540..f496132 100644 --- a/df_datalink_ge/bsp/ps7_cortexa9_0/libsrc/gpio_v4_4/src/xgpio_g.c +++ b/df_datalink_ge/bsp/ps7_cortexa9_0/libsrc/gpio_v4_4/src/xgpio_g.c @@ -43,10 +43,10 @@ XGpio_Config XGpio_ConfigTable[XPAR_XGPIO_NUM_INSTANCES] = { { - XPAR_CONFIG_GPIO_DEVICE_ID, - XPAR_CONFIG_GPIO_BASEADDR, - XPAR_CONFIG_GPIO_INTERRUPT_PRESENT, - XPAR_CONFIG_GPIO_IS_DUAL + XPAR_MPC_GPIO_DEVICE_ID, + XPAR_MPC_GPIO_BASEADDR, + XPAR_MPC_GPIO_INTERRUPT_PRESENT, + XPAR_MPC_GPIO_IS_DUAL } }; diff --git a/df_datalink_ge/bsp/system.mss b/df_datalink_ge/bsp/system.mss index bc2857a..e9e096b 100644 --- a/df_datalink_ge/bsp/system.mss +++ b/df_datalink_ge/bsp/system.mss @@ -18,18 +18,6 @@ BEGIN PROCESSOR END -BEGIN DRIVER - PARAMETER DRIVER_NAME = frame_uart - PARAMETER DRIVER_VER = 1.0 - PARAMETER HW_INSTANCE = Frame_Uart_0 -END - -BEGIN DRIVER - PARAMETER DRIVER_NAME = gpio - PARAMETER DRIVER_VER = 4.4 - PARAMETER HW_INSTANCE = config_gpio -END - BEGIN DRIVER PARAMETER DRIVER_NAME = generic PARAMETER DRIVER_VER = 2.0 @@ -54,6 +42,12 @@ BEGIN DRIVER PARAMETER HW_INSTANCE = mpc_bram_interface_mpc_bram_ctrl END +BEGIN DRIVER + PARAMETER DRIVER_NAME = gpio + PARAMETER DRIVER_VER = 4.4 + PARAMETER HW_INSTANCE = mpc_gpio +END + BEGIN DRIVER PARAMETER DRIVER_NAME = bram PARAMETER DRIVER_VER = 4.3 diff --git a/df_datalink_ge/build/makefile b/df_datalink_ge/build/makefile index 1ff2505..e812210 100644 --- a/df_datalink_ge/build/makefile +++ b/df_datalink_ge/build/makefile @@ -13,7 +13,7 @@ RM := rm -rf -include sources.mk -include src/util/subdir.mk -include src/time_ctrl/subdir.mk --include src/systembus/subdir.mk +-include src/mpc/subdir.mk -include src/networking/phy_layer/subdir.mk -include src/networking/link_layer/geometry/subdir.mk -include src/networking/link_layer/subdir.mk @@ -38,7 +38,7 @@ endif -include ../makefile.defs -# Add inputs and outputs from these tool invocations to the build variables +# Add inputs and outputs from these tool invocations to the build variables ELFSIZE += \ df_datalink_ge.elf.size \ diff --git a/df_datalink_ge/build/src/systembus/subdir.mk b/df_datalink_ge/build/src/mpc/subdir.mk similarity index 77% rename from df_datalink_ge/build/src/systembus/subdir.mk rename to df_datalink_ge/build/src/mpc/subdir.mk index fd7331d..dc66be5 100644 --- a/df_datalink_ge/build/src/systembus/subdir.mk +++ b/df_datalink_ge/build/src/mpc/subdir.mk @@ -2,18 +2,18 @@ # Automatically-generated file. Do not edit! ################################################################################ -# Add inputs and outputs from these tool invocations to the build variables +# Add inputs and outputs from these tool invocations to the build variables C_SRCS += \ -../src/systembus/systembus.c \ -../src/systembus/systembus_uart.c +../src/mpc/mpc.c \ +../src/mpc/mpc_hw.c OBJS += \ -./src/systembus/systembus.o \ -./src/systembus/systembus_uart.o +./src/mpc/mpc.o \ +./src/mpc/mpc_hw.o C_DEPS += \ -./src/systembus/systembus.d \ -./src/systembus/systembus_uart.d +./src/mpc/mpc.d \ +./src/mpc/mpc_hw.d # Each subdirectory must supply rules for building sources it contributes