1 files changed, 30 insertions, 32 deletions
diff --git a/blacklist.txt b/blacklist.txt
index 805f38f..023c254 100644
--- a/blacklist.txt
+++ b/blacklist.txt
@@ -645,38 +645,36 @@ tp_smapi-lts:tp_smapi-lts:::[technical] adapted to nonfree linux-lts kernel
 truecrypt::::[FIXME:description] license too complex to understand and consider free
 ttf-hannom::::[FIXME:description]
 ttytter::::[nonfree] licensed under FFSL (Floodgap Free Software License)
-uboot-a10-olinuxino-lime:uboot-a10-olinuxino-lime-linux-libre:::    [technical] adapted to nonfree linux kernel
-uboot-a10s-olinuxino-micro:uboot-a10s-olinuxino-micro-linux-libre:::[technical] adapted to nonfree linux kernel
-uboot-a13-olinuxino:uboot-a13-olinuxino-linux-libre:::              [technical] adapted to nonfree linux kernel
-uboot-a13-olinuxino-micro:uboot-a13-olinuxino-micro-linux-libre:::  [technical] adapted to nonfree linux kernel
-uboot-a20-olinuxino-lime:uboot-a20-olinuxino-lime-linux-libre:::    [technical] adapted to nonfree linux kernel
-uboot-a20-olinuxino-lime2:uboot-a20-olinuxino-lime2-linux-libre:::  [technical] adapted to nonfree linux kernel
-uboot-a20-olinuxino-micro:uboot-a20-olinuxino-micro-linux-libre:::  [technical] adapted to nonfree linux kernel
-uboot-beagleboard:uboot-beagleboard-linux-libre:::                  [technical] adapted to nonfree linux kernel
-uboot-beaglebone:uboot-beaglebone-linux-libre:::                    [technical] adapted to nonfree linux kernel
-uboot-boundary:uboot-boundary-linux-libre:::                        [technical] adapted to nonfree linux kernel
-uboot-cubieboard:uboot-cubieboard-linux-libre:::                    [technical] adapted to nonfree linux kernel
-uboot-cubieboard2:uboot-cubieboard2-linux-libre:::                  [technical] adapted to nonfree linux kernel
-uboot-cubietruck:uboot-cubietruck-linux-libre:::                    [technical] adapted to nonfree linux kernel
-uboot-chiliboard:uboot-chiliboard:::                                [technical] adapted to nonfree linux kernel
-uboot-cubox:uboot-cubox-linux-libre:::                              [technical] adapted to nonfree linux kernel
-uboot-cubox-i:uboot-cubox-i-linux-libre:::                          [technical] adapted to nonfree linux kernel
-uboot-odroid::::                                                    [uses-nonfree] adapted to nonfree linux kernel and ODROID devices that requires nonfree startup software -> https://www.fsf.org/resources/hw/single-board-computers
-uboot-odroid-c1::::                                                 [uses-nonfree] adapted to nonfree linux kernel and ODROID devices that requires nonfree startup software -> https://www.fsf.org/resources/hw/single-board-computers
-uboot-odroid-x::::                                                  [uses-nonfree] adapted to nonfree linux kernel and ODROID devices that requires nonfree startup software -> https://www.fsf.org/resources/hw/single-board-computers
-uboot-odroid-xu3::::                                                [uses-nonfree] adapted to nonfree linux kernel and ODROID devices that requires nonfree startup software -> https://www.fsf.org/resources/hw/single-board-computers
-uboot-pandaboard:uboot-pandaboard-linux-libre:::                    [technical] adapted to nonfree linux kernel
-uboot-pcduino:uboot-pcduino-linux-libre:::                          [technical] adapted to nonfree linux kernel
-uboot-pcduino3:uboot-pcduino3-linux-libre:::                        [technical] adapted to nonfree linux kernel
-uboot-pcduino3-nano:uboot-pcduino3-nano-linux-libre:::              [technical] adapted to nonfree linux kernel
-uboot-trimslice:uboot-trimslice-linux-libre:::                      [technical] adapted to nonfree linux kernel
-uboot-udoo-dual:uboot-udoo-dual-linux-libre:::                      [technical] adapted to nonfree linux kernel
-uboot-udoo-quad:uboot-udoo-quad-linux-libre:::                      [technical] adapted to nonfree linux kernel
-uboot-usbarmory:uboot-usbarmory-linux-libre:::                      [technical] adapted to nonfree linux kernel
-uboot-wandboard-solo:uboot-wandboard-solo-linux-libre:::            [technical] adapted to nonfree linux kernel
-uboot-wandboard-dual:uboot-wandboard-dual-linux-libre:::            [technical] adapted to nonfree linux kernel
-uboot-wandboard-quad:uboot-wandboard-quad-linux-libre:::            [technical] adapted to nonfree linux kernel
-uboot-zedboard::::                                                  [technical] adapted to nonfree linux kernel and ArchARM version was not built from source
+uboot-a10-olinuxino-lime:uboot-a10-olinuxino-lime:::    [technical] adapted to nonfree linux kernel
+uboot-a10s-olinuxino-micro:uboot-a10s-olinuxino-micro:::[technical] adapted to nonfree linux kernel
+uboot-a13-olinuxino:uboot-a13-olinuxino:::              [technical] adapted to nonfree linux kernel
+uboot-a13-olinuxino-micro:uboot-a13-olinuxino-micro:::  [technical] adapted to nonfree linux kernel
+uboot-a20-olinuxino-lime:uboot-a20-olinuxino-lime:::    [technical] adapted to nonfree linux kernel
+uboot-a20-olinuxino-lime2:uboot-a20-olinuxino-lime2:::  [technical] adapted to nonfree linux kernel
+uboot-a20-olinuxino-micro:uboot-a20-olinuxino-micro:::  [technical] adapted to nonfree linux kernel
+uboot-beagleboard:uboot-omap3_beagle:::                 [technical] adapted to nonfree linux kernel
+uboot-beaglebone:uboot-am335x_bone:::                   [technical] adapted to nonfree linux kernel
+uboot-boundary:uboot-nitrogen6q:::                      [technical] adapted to nonfree linux kernel
+uboot-cubieboard:uboot-cubieboard:::                    [technical] adapted to nonfree linux kernel
+uboot-cubieboard2:uboot-cubieboard2:::                  [technical] adapted to nonfree linux kernel
+uboot-cubietruck:uboot-cubietruck:::                    [technical] adapted to nonfree linux kernel
+uboot-chiliboard:uboot-chiliboard:::                    [technical] adapted to nonfree linux kernel
+uboot-cubox:uboot-cubox:::                              [technical] adapted to nonfree linux kernel
+uboot-cubox-i:uboot-mx6_cubox-i:::                      [technical] adapted to nonfree linux kernel
+uboot-odroid::::                                        [uses-nonfree] adapted to nonfree linux kernel and ODROID devices that requires nonfree startup software -> https://www.fsf.org/resources/hw/single-board-computers
+uboot-odroid-c1::::                                     [uses-nonfree] adapted to nonfree linux kernel and ODROID devices that requires nonfree startup software -> https://www.fsf.org/resources/hw/single-board-computers
+uboot-odroid-x::::                                      [uses-nonfree] adapted to nonfree linux kernel and ODROID devices that requires nonfree startup software -> https://www.fsf.org/resources/hw/single-board-computers
+uboot-odroid-xu3::::                                    [uses-nonfree] adapted to nonfree linux kernel and ODROID devices that requires nonfree startup software -> https://www.fsf.org/resources/hw/single-board-computers
+uboot-pandaboard:uboot-omap4_panda:::                   [technical] adapted to nonfree linux kernel
+uboot-pcduino:uboot-pcduino:::                          [technical] adapted to nonfree linux kernel
+uboot-pcduino3:uboot-pcduino3:::                        [technical] adapted to nonfree linux kernel
+uboot-pcduino3-nano:uboot-pcduino3-nano:::              [technical] adapted to nonfree linux kernel
+uboot-trimslice:uboot-trimslice:::                      [technical] adapted to nonfree linux kernel
+uboot-udoo-dual:uboot-udoo_dl:::                        [technical] adapted to nonfree linux kernel
+uboot-udoo-quad:uboot-udoo_quad:::                      [technical] adapted to nonfree linux kernel
+uboot-usbarmory:uboot-usbarmory:::                      [technical] adapted to nonfree linux kernel
+uboot-wandboard:uboot-wandboard:::                      [technical] adapted to nonfree linux kernel
+uboot-zedboard::::                                      [technical] adapted to nonfree linux kernel and ArchARM version was not built from source
 unace::::[nonfree] [FIXME:description]
 unarj:arj:::[nonfree] [FIXME:description]
 unetbootin::fsf:unetbootin:[semifree] it lists many non-fsdg operating systems. Remove or change the list of distros available. FUSBi is a fork which does so