From f5c6dc527a5b1ede9538d500058c7997e3886353 Mon Sep 17 00:00:00 2001
From: gtxaspec <gtxent@gmail.com>
Date: Sun, 31 Dec 2023 00:22:01 -0800
Subject: [PATCH] update workflow

---
 .github/scripts/u-boot-ingenic.sh | 19 ++++++++++---------
 .github/workflows/makefile.yml    |  2 +-
 Makefile                          |  2 --
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.github/scripts/u-boot-ingenic.sh b/.github/scripts/u-boot-ingenic.sh
index f9872d08..9857f404 100755
--- a/.github/scripts/u-boot-ingenic.sh
+++ b/.github/scripts/u-boot-ingenic.sh
@@ -4,24 +4,25 @@ export CROSS_COMPILE=mipsel-linux-gnu-
 
 declare -A cfg
 
-cfg[t10]="isvp_t10_sfcnor"
+cfg[t10n]="isvp_t10_sfcnor"
 cfg[t10l]="isvp_t10_sfcnor_lite"
-cfg[t20]="isvp_t20_sfcnor"
+cfg[t20n]="isvp_t20_sfcnor"
 cfg[t20l]="isvp_t20_sfcnor_lite"
-cfg[t31n]="isvp_t31_sfcnor"
-cfg[t31l]="isvp_t31_sfcnor_lite"
-cfg[t31x]="isvp_t31_sfcnor_ddr128M"
-cfg[t31a]="isvp_t31a_sfcnor_ddr128M"
-cfg[t31al]="isvp_t31al_sfcnor_ddr128M"
-cfg[t31lc]="isvp_t31lc_sfcnor"
+cfg[t20x]="isvp_t20_sfcnor_ddr128M"
 cfg[t21n]="isvp_t21_sfcnor"
 cfg[t30n]="isvp_t30_sfcnor"
 cfg[t30l]="isvp_t30_sfcnor_lite"
 cfg[t30x]="isvp_t30_sfcnor_ddr128M"
 cfg[t30a]="isvp_t30a_sfcnor_ddr128M"
 cfg[t30a1]="isvp_t30a1_sfcnor_ddr128M"
+cfg[t31n]="isvp_t31_sfcnor"
+cfg[t31l]="isvp_t31_sfcnor_lite"
+cfg[t31x]="isvp_t31_sfcnor_ddr128M"
+cfg[t31a]="isvp_t31a_sfcnor_ddr128M"
+cfg[t31al]="isvp_t31al_sfcnor_ddr128M"
+cfg[t31lc]="isvp_t31lc_sfcnor"
 
-ln -s compiler-gcc7.h include/linux/compiler-gcc10.h
+#ln -s compiler-gcc7.h include/linux/compiler-gcc10.h
 mkdir -p ../ingenic-output
 
 for soc in ${!cfg[@]}; do
diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml
index 28cf97dc..300e4fcd 100644
--- a/.github/workflows/makefile.yml
+++ b/.github/workflows/makefile.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Prepare
         run: |
           sudo apt-get update
-          sudo apt-get install gcc-arm-linux-gnueabi gcc-mipsel-linux-gnu lzop u-boot-tools
+          sudo apt-get install gcc-mipsel-linux-gnu lzop u-boot-tools
 
       - name: u-boot-ingenic
         run: |
diff --git a/Makefile b/Makefile
index 61c46654..c3d161b3 100644
--- a/Makefile
+++ b/Makefile
@@ -918,7 +918,6 @@ clean:
 	@rm -f $(obj)include/generated/asm-offsets.h
 	@rm -f $(obj)$(CPUDIR)/$(SOC)/asm-offsets.s
 	@rm -f $(TIMESTAMP_FILE) $(VERSION_FILE)
-	@rm -f uboot_build/*
 	@$(MAKE) -s -C doc/DocBook/ cleandocs
 	@$(MAKE) -s -C $(TOPTREE)tools/ingenic-tools/ clean
 	@find $(OBJTREE) -type f \
@@ -970,7 +969,6 @@ clobber:	tidy
 	@rm -f $(obj)u-boot-lzo.img
 	@rm -f $(obj)u-boot-lzo.bin
 	@rm -f $(obj)u-boot-lzo-with-spl.bin
-	@rm -rf uboot_build
 
 mrproper \
 distclean:	clobber unconfig