X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.27;h=d503430fda796441be502af364ef2cd724541809;hb=0f75f297380c8e7b5975ece4e1a035ddcdf40c23;hp=d3199ea090cc108a39b0b25fcd728a9cc2e9342e;hpb=0328db7a3d94e67c49c28a3bec520db098829f1e;p=releases.git diff --git a/deblob-2.6.27 b/deblob-2.6.27 index d3199ea090cc..d503430fda79 100755 --- a/deblob-2.6.27 +++ b/deblob-2.6.27 @@ -98,10 +98,34 @@ function dummy_blob { echo $1 exists, something is wrong >&2 exit 1 else - echo '/*(DEBLOBBED)*/' > $1 + hack_fwmk "NONFREE_FW += $2" fi } +function clean_fw { + #$1 = firmware text input, $2 = firmware output + if test ! -f $1; then + echo $1 does not exist, something is wrong >&2 + exit 1 + elif test -f $2; then + echo $2 exists, something is wrong >&2 + exit 1 + fi + clean_blob $1 + 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 @@ -172,20 +196,14 @@ done # Identify the tarball. sed -i "s,^EXTRAVERSION.*,&-libre$extra," Makefile -# We use `# clean_blob\nclean_file' to indicate that a file is -# allegedly under the GPL or some other compatible license, but we -# don't have its sources. Using the default deblobbing machinery -# doesn't work, because then the binary firmware generators would barf -# at the deblobbed file. +hack_fwmk 'NONFREE_FW :=' ####################### # Removed ATM Drivers # ####################### # ATM_AMBASSADOR - Madge Ambassador (Collage PCI 155 Server) -# clean_blob -clean_file firmware/atmsar11.HEX -empty_blob firmware/atmsar11.fw +clean_fw firmware/atmsar11.HEX firmware/atmsar11.fw # ATM_FORE200E_PCA # ATM_FORE200E_SBA - SBA-200E @@ -299,9 +317,7 @@ clean_kconfig drivers/media/video/pwc/Kconfig 'USB_PWC' clean_mk CONFIG_USB_PWC drivers/media/video/Makefile # VIDEO_CPIA - CPiA Video For Linux -# clean_blob -clean_file firmware/cpia2/stv0672_vp4.bin.ihex -dummy_blob firmware/cpia2/stv0672_vp4.bin +clean_fw firmware/cpia2/stv0672_vp4.bin.ihex firmware/cpia2/stv0672_vp4.bin clean_kconfig drivers/media/video/Kconfig 'VIDEO_CPIA' clean_kconfig drivers/media/video/Kconfig 'VIDEO_CPIA_PP' clean_kconfig drivers/media/video/Kconfig 'VIDEO_CPIA_USB' @@ -312,12 +328,8 @@ clean_mk CONFIG_VIDEO_CPIA_USB drivers/media/video/Makefile clean_mk CONFIG_VIDEO_CPIA2 drivers/media/video/Makefile # USB_DABUSB - DABUSB driver -# clean_blob -clean_file firmware/dabusb/bitstream.bin.ihex -dummy_blob firmware/dabusb/bitstream.bin -# clean_blob -clean_file firmware/dabusb/firmware.HEX -dummy_blob firmware/dabusb/firmware.fw +clean_fw firmware/dabusb/bitstream.bin.ihex firmware/dabusb/bitstream.bin +clean_fw firmware/dabusb/firmware.HEX firmware/dabusb/firmware.fw clean_kconfig drivers/media/Kconfig 'USB_DABUSB' clean_mk CONFIG_USB_DABUSB drivers/media/video/Makefile @@ -479,6 +491,12 @@ dummy_blob firmware/kaweth/trigger_code_fix.bin clean_kconfig drivers/net/usb/Kconfig 'USB_KAWETH' clean_mk CONFIG_USB_KAWETH drivers/net/usb/Makefile +# wireless + +clean_blob drivers/net/wireless/rtl8187_dev.c +# clean_kconfig drivers/net/wireless/Kconfig 'RTL8187' +# clean_mk CONFIG_RTL8187 drivers/net/wireless/Makefile + ######################## # Removed s390 Drivers # @@ -489,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 # ######################## @@ -603,25 +639,15 @@ clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA49WLC' clean_mk CONFIG_USB_SERIAL_KEYSPAN drivers/usb/serial/Makefile # USB_SERIAL_EDGEPORT - USB Inside Out Edgeport Serial Driver -# clean_blob -clean_file firmware/edgeport/boot.H16 -dummy_blob firmware/edgeport/boot.fw -# clean_blob -clean_file firmware/edgeport/down.H16 -dummy_blob firmware/edgeport/down.fw -# clean_blob -clean_file firmware/edgeport/down2.H16 -dummy_blob firmware/edgeport/down2.fw +clean_fw firmware/edgeport/boot.H16 firmware/edgeport/boot.fw +clean_fw firmware/edgeport/down.H16 firmware/edgeport/down.fw +clean_fw firmware/edgeport/down2.H16 firmware/edgeport/down2.fw clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_EDGEPORT' clean_mk CONFIG_USB_SERIAL_EDGEPORT drivers/usb/serial/Makefile # USB_SERIAL_EDGEPORT_TI - USB Inside Out Edgeport Serial Driver (TI devices) -# clean_blob -clean_file firmware/edgeport/boot2.H16 -dummy_blob firmware/edgeport/boot2.fw -# clean_blob -clean_file firmware/edgeport/down3.bin.ihex -dummy_blob firmware/edgeport/down3.bin +clean_fw firmware/edgeport/boot2.H16 firmware/edgeport/boot2.fw +clean_fw firmware/edgeport/down3.bin.ihex firmware/edgeport/down3.bin clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_EDGEPORT_TI' clean_mk CONFIG_USB_SERIAL_EDGEPORT_TI drivers/usb/serial/Makefile @@ -634,15 +660,9 @@ clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_TI' clean_mk CONFIG_USB_SERIAL_TI drivers/usb/serial/Makefile # USB_SERIAL_WHITEHEAT - USB ConnectTech WhiteHEAT Serial Driver -# clean_blob -clean_file firmware/whiteheat.HEX -dummy_blob firmware/whiteheat.fw -# clean_blob -clean_file firmware/whiteheat_loader.HEX -dummy_blob firmware/whiteheat_loader.fw -# clean_blob -clean_file firmware/whiteheat_loader_debug.HEX -dummy_blob firmware/whiteheat_loader_debug.fw +clean_fw firmware/whiteheat.HEX firmware/whiteheat.fw +clean_fw firmware/whiteheat_loader.HEX firmware/whiteheat_loader.fw +clean_fw firmware/whiteheat_loader_debug.HEX firmware/whiteheat_loader_debug.fw clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_WHITEHEAT' clean_mk CONFIG_USB_SERIAL_WHITEHEAT drivers/usb/serial/Makefile @@ -661,6 +681,10 @@ clean_blob drivers/video/chipsfb.c clean_kconfig drivers/video/Kconfig 'FB_CT65550' clean_mk CONFIG_FB_CT65550 drivers/video/Makefile +# USB_GSPCA - Conexant 11646 +clean_blob drivers/media/video/gspca/conex.c +# clean_kconfig drivers/video/gspca/Kconfig 'USB_GSPCA' +# clean_mk CONFIG_USB_GSPCA drivers/video/Makefile ######################### # Removed Sound Drivers # @@ -711,4 +735,8 @@ dummy_blob firmware/sb16/ima_adpcm_playback.csp # Just remove it. clean_file sound/isa/wavefront/yss225.c +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