X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.27;h=f1c7991a8800419ce7bde96576c06964485f36a5;hb=c0666f589eded2565c1324e02d6ab489755eff3c;hp=e2bb5f011a25fd693353c4676af6e88d2f66d97e;hpb=d798985b94b06ba8b03775ced71f85fe6c2e3687;p=releases.git

diff --git a/deblob-2.6.27 b/deblob-2.6.27
index e2bb5f011a25..f1c7991a8800 100755
--- a/deblob-2.6.27
+++ b/deblob-2.6.27
@@ -98,7 +98,7 @@ function dummy_blob {
 	    echo $1 exists, something is wrong >&2
 	    exit 1
 	else
-	    echo "\$(obj)/$1: ; mkdir -p \$(dir \$@) && : > \$@" >> firmware/Makefile
+	    hack_fwmk "NONFREE_FW += $2"
 	fi
 }
 
@@ -115,6 +115,17 @@ function clean_fw {
 	dummy_blob $2
 }
 
+function hack_fwmk {
+	if test ! -f firmware/Makefile; then
+	    echo firmware/Makefile does not exist, something is wrong >&2
+	    exit 1
+	fi
+
+	sed -i "/^[ 	]*fw-shipped-all[ 	]*:=[ 	]*/i\
+$1
+" firmware/Makefile
+}
+
 function clean_kconfig {
         #$1 = filename $2 = things to remove
         echo Marking config $2 as depending on NONFREE in $1
@@ -185,6 +196,8 @@ done
 # Identify the tarball.
 sed -i "s,^EXTRAVERSION.*,&-libre$extra," Makefile
 
+hack_fwmk 'NONFREE_FW :='
+
 #######################
 # Removed ATM Drivers #
 #######################
@@ -494,6 +507,24 @@ clean_blob drivers/s390/net/qeth_core_mpc.c
 clean_kconfig drivers/s390/net/Kconfig 'QETH'
 clean_mk CONFIG_QETH drivers/s390/net/Makefile
 
+
+#####################
+# Removed SH boards #
+#####################
+
+# SH_AP325RXA - Renesas AP-325RXA board
+clean_blob arch/sh/boards/renesas/ap325rxa/setup.c
+clean_kconfig arch/sh/Kconfig 'SH_AP325RXA'
+clean_mk CONFIG_SH_AP325RXA arch/sh/boards/renesas/Makefile
+
+# SH_MIGOR - Reneasas Migo-R
+clean_blob arch/sh/boards/renesas/migor/lcd_qvga.c -s 16
+clean_blob arch/sh/boards/renesas/migor/setup.c
+clean_kconfig arch/sh/boards/renesas/Kconfig 'SH_MIGOR'
+clean_kconfig arch/sh/boards/renesas/migor/Kconfig 'SH_MIGOR_QVGA'
+clean_mk CONFIG_MIGOR_QVGA arch/sh/boards/renesas/Makefile
+
+
 ########################
 # Removed SCSI Drivers #
 ########################
@@ -703,5 +734,10 @@ dummy_blob firmware/sb16/ima_adpcm_playback.csp
 # Most of this file is not matched by deblob-check because of WAIT_IDLE.
 # Just remove it.
 clean_file sound/isa/wavefront/yss225.c
+clean_kconfig sound/isa/Kconfig 'SND_WAVEFRONT_FIRMWARE_IN_KERNEL'
+
+hack_fwmk 'fw-shipped-y := $(filter-out $(NONFREE_FW), $(fw-shipped-y))'
+hack_fwmk 'fw-shipped-m := $(filter-out $(NONFREE_FW), $(fw-shipped-m))'
+hack_fwmk 'fw-shipped-  := $(filter-out $(NONFREE_FW), $(fw-shipped-) )'
 
 exit 0