README and update firmare.tar.gz

README.en.md

@@ -1,20 +1,26 @@
 # raspberrypi-firmware
 
 #### Description
-Firmware for RaspberryPi. These firmware files is from the repositories in RaspberryPi community.
+Firmware for RaspberryPi. These firmwares are from the repositories in RaspberryPi community.
 
+- https://github.com/raspberrypi/firmware
 - https://github.com/RPi-Distro/bluez-firmware.git
 - https://github.com/RPi-Distro/firmware-nonfree.git
-- https://github.com/RPi-Distro/pi-bluetooth.git
 
 #### Software Architecture
 
 AArch64
 
+#### Installation
+
+`dnf install raspberrypi-firmware`
+
 #### Instructions
 
-1.  dnf install raspberrypi-firmware
-2.  When you want to make image for RaspberryPi, you need to copy files in /usr/lib/firmware/boot/ to the root dir in boot partition.
+After installing raspberrypi-firmware,
+
+1.  Files from firmware repository will be stored in the directory of `/boot`.
+2.  Files from bluez-firmware and firmware-nonfree repositories will be stored in the directory of `/usr/lib/firmware`.
 
 #### Contribution
 

README.md

@@ -2,20 +2,26 @@
 
 #### 介绍
 
-用于打包 Raspberry Pi 的固件文件。固件文件来自于 RaspberryPi 社区的上游仓库，当前主要使用支持 Raspberry Pi 4 运行的支持。文件来自以下仓库：
+用于打包 Raspberry Pi 的固件文件。固件文件来自于 Raspberry Pi 社区的上游仓库：
 
+- https://github.com/raspberrypi/firmware
 - https://github.com/RPi-Distro/bluez-firmware.git
 - https://github.com/RPi-Distro/firmware-nonfree.git
-- https://github.com/RPi-Distro/pi-bluetooth.git
 
 #### 软件架构
 
 AArch64
 
+#### 安装教程
+
+`dnf install raspberrypi-firmware`
+
 #### 使用说明
 
-1.  执行 dnf install raspberrypi-firmware 安装。
-2.  其中生成树莓派镜像时，应拷贝 /usr/lib/firmware/boot/ 中的文件至启动分区根目录中。
+安装 raspberrypi-firmware 后，
+
+1. firmware 仓库下的固件等文件覆盖到树莓派 `/boot` 目录下。
+2. bluez-firmware 和 firmware-nonfree 仓库下的固件等文件覆盖到 `/usr/lib/firmware` 下。
 
 #### 参与贡献
 

raspberrypi-firmware.spec

@@ -3,7 +3,7 @@
 %global debug_package %{nil}
 
 Name:		raspberrypi-firmware
-Version:	20200512
+Version:	20200703
 Release:	1
 Summary:	Firmware files used for RaspberryPi
 License:	GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted
@@ -22,13 +22,13 @@ Source2:	LICENCE.broadcom_bcm43xx
 This package contains firmware images required by some RaspberryPi devices.
 
 %install
-mkdir -p %{buildroot}/%{_lib_path}
-mkdir -p %{buildroot}/%{_license_path}
-mkdir -p %{buildroot}/boot/overlays
-install -p -m 644 %{_sourcedir}/LICENCE.* %{buildroot}/%{_license_path}
-install -p -m 644 firmware/* %{buildroot}/%{_lib_path}
+mkdir -p %{buildroot}%{_lib_path}/brcm
+mkdir -p %{buildroot}%{_license_path}
+mkdir -p %{buildroot}/boot
+install -p -m 644 %{_sourcedir}/LICENCE.* %{buildroot}%{_license_path}
+install -p -m 644 firmware/*.* %{buildroot}%{_lib_path}
+install -p -m 644 firmware/brcm/* %{buildroot}%{_lib_path}/brcm
 install -p -m 644 firmware-boot/*.* %{buildroot}/boot
-install -p -m 644 firmware-boot/overlays/* %{buildroot}/boot/overlays
 
 %files
 %dir %{_lib_path}