wip: fix issues after merge

quad/xsdk_workspace/real_quad/src/hw_impl_zybo_uart.c

@@ -245,6 +245,7 @@ int SetupInterruptSystem(struct ZyboUARTState *state, u16 UartIntrId, Xil_Except
 		return XST_FAILURE;
 	}
 
+    memset(&state->xscugic, 0, sizeof(XScuGic));
 	Status = XScuGic_CfgInitialize(&state->xscugic, IntcConfig,
 					IntcConfig->CpuBaseAddress);
 	if (Status != XST_SUCCESS) {

quad/xsdk_workspace/real_quad/src/main.c

@@ -4,7 +4,7 @@
 #include "type_def.h"
 #include "platform.h"
 
-//#define RUN_TESTS
+#define RUN_TESTS
 
 /**
  * Create the hardware drivers, and place them on the hardware struct.
@@ -53,7 +53,7 @@ int main()
   //test_zybo_i2c_lidar();
   //test_zybo_i2c_all();
   //test_zybo_rc_receiver();
-  test_zybo_motors();
+  //test_zybo_motors();
   //test_zybo_uart();
   //test_zybo_axi_timer();
   test_zybo_uart_comm();

quad/xsdk_workspace/system_bsp/.cproject

@@ -3,8 +3,8 @@
 
 <cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="org.eclipse.cdt.core.default.config.946402869">
-			<storageModule buildSystemId="org.eclipse.cdt.core.defaultConfigDataProvider" id="org.eclipse.cdt.core.default.config.946402869" moduleId="org.eclipse.cdt.core.settings" name="Configuration">
+		<cconfiguration id="org.eclipse.cdt.core.default.config.154473096">
+			<storageModule buildSystemId="org.eclipse.cdt.core.defaultConfigDataProvider" id="org.eclipse.cdt.core.default.config.154473096" moduleId="org.eclipse.cdt.core.settings" name="Configuration">
 				<externalSettings/>
 				<extensions/>
 			</storageModule>

quad/xsdk_workspace/system_bsp/system.mss

@@ -15,6 +15,7 @@ BEGIN PROCESSOR
  PARAMETER DRIVER_NAME = cpu_cortexa9
  PARAMETER DRIVER_VER = 1.01.a
  PARAMETER HW_INSTANCE = ps7_cortexa9_0
+ PARAMETER EXTRA_COMPILER_FLAGS = -O0 -g
 END
 
 

quad/xsdk_workspace/zybo_fsbl/Release/makefile

-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
--include ../makefile.init
-
-RM := rm -rf
-
-# All of the sources participating in the build are defined here
--include sources.mk
--include src/subdir.mk
--include subdir.mk
--include objects.mk
-
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(strip $(C_DEPS)),)
--include $(C_DEPS)
-endif
-ifneq ($(strip $(S_UPPER_DEPS)),)
--include $(S_UPPER_DEPS)
-endif
-endif
-
--include ../makefile.defs
-
-# Add inputs and outputs from these tool invocations to the build variables 
-ELFSIZE += \
-zybo_fsbl.elf.size \
-
-
-# All Target
-all: zybo_fsbl.elf secondary-outputs
-
-# Tool invocations
-zybo_fsbl.elf: $(OBJS) ../src/lscript.ld $(USER_OBJS)
-	@echo 'Building target: $@'
-	@echo 'Invoking: ARM gcc linker'
-	arm-xilinx-eabi-gcc -L"/local/ucart/MicroCART_17-18/quad/xsdk_workspace/zybo_fsbl/src" -Wl,-T -Wl,../src/lscript.ld -L../../zybo_fsbl_bsp/ps7_cortexa9_0/lib -o "zybo_fsbl.elf" $(OBJS) $(USER_OBJS) $(LIBS)
-	@echo 'Finished building target: $@'
-	@echo ' '
-
-zybo_fsbl.elf.size: zybo_fsbl.elf
-	@echo 'Invoking: ARM Print Size'
-	arm-xilinx-eabi-size zybo_fsbl.elf  |tee "zybo_fsbl.elf.size"
-	@echo 'Finished building: $@'
-	@echo ' '
-
-# Other Targets
-clean:
-	-$(RM) $(OBJS)$(C_DEPS)$(EXECUTABLES)$(ELFSIZE)$(S_UPPER_DEPS) zybo_fsbl.elf
-	-@echo ' '
-
-secondary-outputs: $(ELFSIZE)
-
-.PHONY: all clean dependents
-.SECONDARY:
-
--include ../makefile.targets

quad/xsdk_workspace/zybo_fsbl/Release/objects.mk

-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-USER_OBJS :=
-
-LIBS := -lrsa -Wl,--start-group,-lxil,-lgcc,-lc,--end-group
-

quad/xsdk_workspace/zybo_fsbl/Release/sources.mk

-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-O_SRCS := 
-C_SRCS := 
-LD_SRCS := 
-S_UPPER_SRCS := 
-S_SRCS := 
-OBJ_SRCS := 
-OBJS := 
-C_DEPS := 
-EXECUTABLES := 
-ELFSIZE := 
-S_UPPER_DEPS := 
-
-# Every subdirectory with source files must be described here
-SUBDIRS := \
-src \
-

quad/xsdk_workspace/zybo_fsbl/Release/src/subdir.mk

-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-# Add inputs and outputs from these tool invocations to the build variables 
-C_SRCS += \
-../src/ddr_init.c \
-../src/ff.c \
-../src/fsbl_hooks.c \
-../src/image_mover.c \
-../src/main.c \
-../src/md5.c \
-../src/mmc.c \
-../src/nand.c \
-../src/nor.c \
-../src/pcap.c \
-../src/ps7_init.c \
-../src/qspi.c \
-../src/rsa.c \
-../src/sd.c 
-
-LD_SRCS += \
-../src/lscript.ld 
-
-S_UPPER_SRCS += \
-../src/fsbl_handoff.S 
-
-OBJS += \
-./src/ddr_init.o \
-./src/ff.o \
-./src/fsbl_handoff.o \
-./src/fsbl_hooks.o \
-./src/image_mover.o \
-./src/main.o \
-./src/md5.o \
-./src/mmc.o \
-./src/nand.o \
-./src/nor.o \
-./src/pcap.o \
-./src/ps7_init.o \
-./src/qspi.o \
-./src/rsa.o \
-./src/sd.o 
-
-C_DEPS += \
-./src/ddr_init.d \
-./src/ff.d \
-./src/fsbl_hooks.d \
-./src/image_mover.d \
-./src/main.d \
-./src/md5.d \
-./src/mmc.d \
-./src/nand.d \
-./src/nor.d \
-./src/pcap.d \
-./src/ps7_init.d \
-./src/qspi.d \
-./src/rsa.d \
-./src/sd.d 
-
-S_UPPER_DEPS += \
-./src/fsbl_handoff.d 
-
-
-# Each subdirectory must supply rules for building sources it contributes
-src/%.o: ../src/%.c
-	@echo 'Building file: $<'
-	@echo 'Invoking: ARM gcc compiler'
-	arm-xilinx-eabi-gcc -Wall -O2 -c -fmessage-length=0 -I../../zybo_fsbl_bsp/ps7_cortexa9_0/include -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
-	@echo 'Finished building: $<'
-	@echo ' '
-
-src/%.o: ../src/%.S
-	@echo 'Building file: $<'
-	@echo 'Invoking: ARM gcc compiler'
-	arm-xilinx-eabi-gcc -Wall -O2 -c -fmessage-length=0 -I../../zybo_fsbl_bsp/ps7_cortexa9_0/include -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
-	@echo 'Finished building: $<'
-	@echo ' '
-
-

quad/xsdk_workspace/zybo_fsbl_bsp/.cproject

@@ -3,8 +3,8 @@
 
 <cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="org.eclipse.cdt.core.default.config.1389527391">
-			<storageModule buildSystemId="org.eclipse.cdt.core.defaultConfigDataProvider" id="org.eclipse.cdt.core.default.config.1389527391" moduleId="org.eclipse.cdt.core.settings" name="Configuration">
+		<cconfiguration id="org.eclipse.cdt.core.default.config.1193087237">
+			<storageModule buildSystemId="org.eclipse.cdt.core.defaultConfigDataProvider" id="org.eclipse.cdt.core.default.config.1193087237" moduleId="org.eclipse.cdt.core.settings" name="Configuration">
 				<externalSettings/>
 				<extensions/>
 			</storageModule>