Skip to contentSkip to conversation

isci, firmware: Remove isci fallback parameter blob and generator

PATCH Applied Ben Hutchings 2 participants 2 messages Dec 29, 2011 – Jan 4, 2012

Subsystems (2)
SCSI Intel C600 series SAS controller driver
lore
Share & tools
lore

Ben Hutchings

author
#0 lore raw

PATCH 1/1 isci, firmware: Remove isci fallback parameter blob and generator

This parameter blob and generator program have been moved to the linux-firmware.git repository.

Signed-off-by Ben Hutchings <[email protected]>
---
 drivers/scsi/isci/firmware/Makefile    |   19 ------
 drivers/scsi/isci/firmware/README      |   36 ------------
 drivers/scsi/isci/firmware/create_fw.c |   99 --------------------------------
 drivers/scsi/isci/firmware/create_fw.h |   77 -------------------------
 firmware/Makefile                      |    1 -
 firmware/isci/isci_firmware.bin.ihex   |   16 -----
 6 files changed, 0 insertions(+), 248 deletions(-)
 delete mode 100644 drivers/scsi/isci/firmware/Makefile
 delete mode 100644 drivers/scsi/isci/firmware/README
 delete mode 100644 drivers/scsi/isci/firmware/create_fw.c
 delete mode 100644 drivers/scsi/isci/firmware/create_fw.h
 delete mode 100644 firmware/isci/isci_firmware.bin.ihex
drivers/scsi/isci/firmware/Makefile deleted +0 -19
deleted file mode 100644
index 5f54461..0000000
@@ -1,19 +0,0 @@
-# Makefile for create_fw
-#
-CC=gcc
-CFLAGS=-c -Wall -O2 -g
-LDFLAGS=
-SOURCES=create_fw.c
-OBJECTS=$(SOURCES:.cpp=.o)
-EXECUTABLE=create_fw
-
-all: $(SOURCES) $(EXECUTABLE)
-
-$(EXECUTABLE): $(OBJECTS)
-	$(CC) $(LDFLAGS) $(OBJECTS) -o $@
-
-.c.o:
-	$(CC) $(CFLAGS) $< -O $@
-
-clean:
-	rm -f *.o $(EXECUTABLE)
drivers/scsi/isci/firmware/README deleted +0 -36
deleted file mode 100644
index 8056d2b..0000000
@@ -1,36 +0,0 @@
-This defines the temporary binary blow we are to pass to the SCU
-driver to emulate the binary firmware that we will eventually be
-able to access via NVRAM on the SCU controller.
-
-The current size of the binary blob is expected to be 149 bytes or larger
-
-Header Types:
-0x1: Phy Masks
-0x2: Phy Gens
-0x3: SAS Addrs
-0xff: End of Data
-
-ID string - u8[12]: "#SCU MAGIC#\0"
-Version - u8: 1
-SubVersion - u8: 0
-
-Header Type - u8: 0x1
-Size - u8: 8
-Phy Mask - u32[8]
-
-Header Type - u8: 0x2
-Size - u8: 8
-Phy Gen - u32[8]
-
-Header Type - u8: 0x3
-Size - u8: 8
-Sas Addr - u64[8]
-
-Header Type - u8: 0xf
-
-
-==============================================================================
-
-Place isci_firmware.bin in /lib/firmware
-Be sure to recreate the initramfs image to include the firmware.
-
drivers/scsi/isci/firmware/create_fw.c deleted +0 -99

99 lines not on this page · raw message

drivers/scsi/isci/firmware/create_fw.h deleted +0 -77

77 lines not on this page · raw message

firmware/Makefile +0 -1
index 5f43bfb..0d15a3d 100644
@@ -82,7 +82,6 @@ fw-shipped-$(CONFIG_SERIAL_8250_CS) += cis/MT5634ZLX.cis cis/RS-COM-2P.cis \
 fw-shipped-$(CONFIG_PCMCIA_SMC91C92) += ositech/Xilinx7OD.bin
 fw-shipped-$(CONFIG_SCSI_ADVANSYS) += advansys/mcode.bin advansys/38C1600.bin \
 				      advansys/3550.bin advansys/38C0800.bin
-fw-shipped-$(CONFIG_SCSI_ISCI) += isci/isci_firmware.bin
 fw-shipped-$(CONFIG_SCSI_QLOGIC_1280) += qlogic/1040.bin qlogic/1280.bin \
 					 qlogic/12160.bin
 fw-shipped-$(CONFIG_SCSI_QLOGICPTI) += qlogic/isp1000.bin
firmware/isci/isci_firmware.bin.ihex deleted +0 -16
deleted file mode 100644
index 2e66195..0000000
@@ -1,16 +0,0 @@
-:10000000495343554F454D42E80018100002000087
-:1000100000000000000000000101000000000000DE
-:10002000FFFFCF5F0100000008DD0B0000FC0F00A8
-:10003000097C0B006EFC0A00FFFFCF5F010000008F
-:1000400008DD0B0000FC0F00097C0B006EFC0A00B1
-:10005000FFFFCF5F0100000008DD0B0000FC0F0078
-:10006000097C0B006EFC0A00FFFFCF5F010000005F
-:1000700008DD0B0000FC0F00097C0B006EFC0A0081
-:100080000101000000000000FFFFCF5F0200000040
-:1000900008DD0B0000FC0F00097C0B006EFC0A0061
-:1000A000FFFFCF5F0200000008DD0B0000FC0F0027
-:1000B000097C0B006EFC0A00FFFFCF5F020000000E
-:1000C00008DD0B0000FC0F00097C0B006EFC0A0031
-:1000D000FFFFCF5F0200000008DD0B0000FC0F00F7
-:0800E000097C0B006EFC0A0014
-:00000001FF
Signature · 1 line
1.7.7.3
Applied
#1 lore raw
Quoted 4 lines · Ben Hutchings

This parameter blob and generator program have been moved to the linux-firmware.git repository.

Signed-off-by Ben Hutchings <[email protected]>

Applied.

I split out the updates for these files into a patch I'll submit to linux-firmware.git, also rebased the pending series for the next merge window (will resubmit shortly).

--
Dan