Change include order, remove patch step

Author: jackctj117

.github/workflows/test-build-psoc6.yml

@@ -40,10 +40,6 @@ jobs:
           repository: Infineon/core-lib
           path: lib/core-lib
 
-      - name: Patch cy_syslib.c to include cy_device_common.h
-        run: |
-          sed -i '/#include "cy_syslib.h"/a #include "cy_device_common.h"' lib/psoc6pdl/drivers/source/cy_syslib.c
-
       - name: Workaround for sources.list
         run: |
             # Replace sources

arch.mk

@@ -960,8 +960,8 @@ ifeq ($(TARGET),psoc6)
         $(CYPRESS_PDL)/drivers/source/cy_crypto.o
 
     CFLAGS+=\
-        -I$(CYPRESS_PDL)/drivers/include \
         -I$(CYPRESS_PDL)/devices/include \
+        -I$(CYPRESS_PDL)/drivers/include \
         -I$(CYPRESS_PDL)/cmsis/include \
         -I$(CYPRESS_TARGET_LIB) \
         -I$(CYPRESS_CORE_LIB)/include \