env: Remove bogus USB vendor/product ids

Many boards use a USB vendor id of 0x4321. This doesn't exist and
shouldn't be used. Remove this and also the bogus product id of 0x1234.
The boards will use the barebox default vendor/product id then.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

7 files changed, 7 insertions, 28 deletions

diff --git a/arch/arm/boards/at91sam9260ek/env/bin/init_board b/arch/arm/boards/at91sam9260ek/env/bin/init_board
index 27d767d33c..f1b476d54a 100644
--- a/arch/arm/boards/at91sam9260ek/env/bin/init_board
+++ b/arch/arm/boards/at91sam9260ek/env/bin/init_board
@@ -3,9 +3,6 @@
 button_name="dfu_bp"
 button_wait=5
 
-product_id=0x1234
-vendor_id=0x4321
-
 dfu_config="/dev/nand0.barebox.bb(barebox)sr,/dev/nand0.kernel.bb(kernel)r,/dev/nand0.rootfs.bb(rootfs)r"
 
 if [ $at91_udc0.vbus != 1 ]; then
@@ -29,7 +26,7 @@ if [ $? = 0 ]; then
 		echo "Start DFU Mode"
 		echo ""
 		led ds5 1
-		dfu ${dfu_config} -P ${product_id} -V ${vendor_id}
+		dfu ${dfu_config}
 		exit
 	fi
 	echo "${button_name} released, normal boot"
diff --git a/arch/arm/boards/at91sam9261ek/env/bin/init_board b/arch/arm/boards/at91sam9261ek/env/bin/init_board
index 8e849c6a60..39a7f0826b 100644
--- a/arch/arm/boards/at91sam9261ek/env/bin/init_board
+++ b/arch/arm/boards/at91sam9261ek/env/bin/init_board
@@ -10,9 +10,6 @@ fi
 button_name="dfu_bp"
 button_wait=5
 
-product_id=0x1234
-vendor_id=0x4321
-
 dfu_config="/dev/nand0.barebox.bb(barebox)sr,/dev/nand0.kernel.bb(kernel)r,/dev/nand0.rootfs.bb(rootfs)r"
 
 if [ $at91_udc0.vbus != 1 ]
@@ -54,5 +51,5 @@ echo "Start DFU Mode"
 echo ""
 
 led ds7 1
-dfu ${dfu_config} -P ${product_id} -V ${vendor_id}
+dfu ${dfu_config}
 led ds7 0
diff --git a/arch/arm/boards/at91sam9263ek/env/bin/init_board b/arch/arm/boards/at91sam9263ek/env/bin/init_board
index f2e6294648..44972a50ec 100644
--- a/arch/arm/boards/at91sam9263ek/env/bin/init_board
+++ b/arch/arm/boards/at91sam9263ek/env/bin/init_board
@@ -10,9 +10,6 @@ fi
 button_name="dfu_bp"
 button_wait=5
 
-product_id=0x1234
-vendor_id=0x4321
-
 dfu_config="/dev/nand0.barebox.bb(barebox)sr,/dev/nand0.kernel.bb(kernel)r,/dev/nand0.rootfs.bb(rootfs)r"
 
 if [ $at91_udc0.vbus != 1 ]
@@ -54,5 +51,5 @@ echo "Start DFU Mode"
 echo ""
 
 led ds2 1
-dfu ${dfu_config} -P ${product_id} -V ${vendor_id}
+dfu ${dfu_config}
 led ds2 0
diff --git a/arch/arm/boards/at91sam9n12ek/env/bin/init_board b/arch/arm/boards/at91sam9n12ek/env/bin/init_board
index b41b63847d..6b44044f17 100644
--- a/arch/arm/boards/at91sam9n12ek/env/bin/init_board
+++ b/arch/arm/boards/at91sam9n12ek/env/bin/init_board
@@ -10,9 +10,6 @@ fi
 button_name="dfu_bp"
 button_wait=5
 
-product_id=0x1234
-vendor_id=0x4321
-
 dfu_config="/dev/nand0.barebox.bb(barebox)sr,/dev/nand0.kernel.bb(kernel)r,/dev/nand0.rootfs.bb(rootfs)r"
 
 if [ $at91_udc0.vbus != 1 ]
@@ -54,4 +51,4 @@ echo "Start DFU Mode"
 echo ""
 
 led ds5 1
-dfu ${dfu_config} -P ${product_id} -V ${vendor_id}
+dfu ${dfu_config}
diff --git a/arch/arm/boards/qil-a926x/env/bin/init_board b/arch/arm/boards/qil-a926x/env/bin/init_board
index 0a6baf722b..09ba7cc981 100644
--- a/arch/arm/boards/qil-a926x/env/bin/init_board
+++ b/arch/arm/boards/qil-a926x/env/bin/init_board
@@ -3,9 +3,6 @@
 button_name="dfu_bp"
 button_wait=5
 
-product_id=0x1234
-vendor_id=0x4321
-
 dfu_config="/dev/nand0.barebox.bb(barebox)sr,/dev/nand0.kernel.bb(kernel)r,/dev/nand0.rootfs.bb(rootfs)r"
 
 if [ $at91_udc0.vbus != 1 ]
@@ -46,4 +43,4 @@ echo ""
 echo "Start DFU Mode"
 echo ""
 
-dfu ${dfu_config} -P ${product_id} -V ${vendor_id}
+dfu ${dfu_config}
diff --git a/arch/arm/boards/telit-evk-pro3/env/init/usb b/arch/arm/boards/telit-evk-pro3/env/init/usb
index 47429f50a4..176c04b7c0 100644
--- a/arch/arm/boards/telit-evk-pro3/env/init/usb
+++ b/arch/arm/boards/telit-evk-pro3/env/init/usb
@@ -5,9 +5,6 @@ gpio_dfu=95
 gpio_name="PC31"
 gpio_wait=5
 
-product_id=0x1234
-vendor_id=0x4321
-
 dfu_config="/dev/nand0.bootstrap.bb(bootstrap)sr,/dev/nand0.barebox.bb(barebox)sr,/dev/nand0.kernel.bb(kernel)r,/dev/nand0.rootfs.bb(rootfs)r"
 
 echo
@@ -30,7 +27,7 @@ if [ $? = 0 ]; then
 	gpio_get_value ${gpio_dfu}
 	if [ $? = 0 ]; then
 		echo "Start DFU Mode"
-		dfu ${dfu_config} -P ${product_id} -V ${vendor_id}
+		dfu ${dfu_config}
 		exit
 	fi
 fi
diff --git a/arch/arm/boards/usb-a926x/env/bin/init_board b/arch/arm/boards/usb-a926x/env/bin/init_board
index 0a6baf722b..09ba7cc981 100644
--- a/arch/arm/boards/usb-a926x/env/bin/init_board
+++ b/arch/arm/boards/usb-a926x/env/bin/init_board
@@ -3,9 +3,6 @@
 button_name="dfu_bp"
 button_wait=5
 
-product_id=0x1234
-vendor_id=0x4321
-
 dfu_config="/dev/nand0.barebox.bb(barebox)sr,/dev/nand0.kernel.bb(kernel)r,/dev/nand0.rootfs.bb(rootfs)r"
 
 if [ $at91_udc0.vbus != 1 ]
@@ -46,4 +43,4 @@ echo ""
 echo "Start DFU Mode"
 echo ""
 
-dfu ${dfu_config} -P ${product_id} -V ${vendor_id}
+dfu ${dfu_config}