Skip to content

Commit

Permalink
kernel: Bump to 3.18.4
Browse files Browse the repository at this point in the history
overlays: Add overlay for PCF8523 RTC driver

firmware: Switch relocatable heap to top-down mode to avoid codec failure with gpu_mem=272

firmware: arm_loader: Add board-specific i2c_arm and i2c_vc dtparam aliases

firmware: arm_loader: Use correct alias when loading initramfs

hello_fft: Use addresses from device tree rather than hard-coded constants
  • Loading branch information
popcornmix committed Jan 28, 2015
1 parent 61e056e commit 9b068fe
Show file tree
Hide file tree
Showing 1,387 changed files with 52,432 additions and 52,413 deletions.
Binary file modified boot/bootcode.bin
Binary file not shown.
Binary file modified boot/fixup.dat
Binary file not shown.
Binary file modified boot/fixup_cd.dat
Binary file not shown.
Binary file modified boot/fixup_x.dat
Binary file not shown.
Binary file modified boot/kernel.img
Binary file not shown.
Binary file modified boot/start.elf
Binary file not shown.
Binary file modified boot/start_cd.elf
Binary file not shown.
Binary file modified boot/start_x.elf
Binary file not shown.
5,326 changes: 2,662 additions & 2,664 deletions extra/Module.symvers

Large diffs are not rendered by default.

99,451 changes: 49,725 additions & 49,726 deletions extra/System.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion extra/git_hash
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8bbf5eef164891b2ceb562978a01b3ff203bbcc7
790fc78afdb8d50f40f2fb18b5aa22e11b8fbc48
2 changes: 1 addition & 1 deletion extra/uname_string
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Linux version 3.18.3+ (dc4@dc4-XPS13-9333) (gcc version 4.8.3 20140303 (prerelease) (crosstool-NG linaro-1.13.1+bzr2650 - Linaro GCC 2014.03) ) #742 PREEMPT Mon Jan 26 18:27:18 GMT 2015
Linux version 3.18.4+ (dc4@dc4-XPS13-9333) (gcc version 4.8.3 20140303 (prerelease) (crosstool-NG linaro-1.13.1+bzr2650 - Linaro GCC 2014.03) ) #743 PREEMPT Wed Jan 28 17:14:53 GMT 2015
Binary file modified hardfp/opt/vc/bin/raspistill
Binary file not shown.
Binary file modified hardfp/opt/vc/bin/raspivid
Binary file not shown.
Binary file modified hardfp/opt/vc/bin/raspiyuv
Binary file not shown.
4 changes: 4 additions & 0 deletions hardfp/opt/vc/include/bcm_host.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ int32_t graphics_get_display_size( const uint16_t display_number,
uint32_t *width,
uint32_t *height);

unsigned bcm_host_get_peripheral_address(void);
unsigned bcm_host_get_peripheral_size(void);
unsigned bcm_host_get_sdram_address(void);

#include "interface/vmcs_host/vc_dispmanx.h"
#include "interface/vmcs_host/vc_tvservice.h"
#include "interface/vmcs_host/vc_cec.h"
Expand Down
Binary file modified hardfp/opt/vc/lib/libEGL_static.a
Binary file not shown.
Binary file modified hardfp/opt/vc/lib/libGLESv2_static.a
Binary file not shown.
Binary file modified hardfp/opt/vc/lib/libbcm_host.so
Binary file not shown.
Binary file modified hardfp/opt/vc/lib/libdebug_sym_static.a
Binary file not shown.
Binary file modified hardfp/opt/vc/lib/libkhrn_client.a
Binary file not shown.
Binary file modified hardfp/opt/vc/lib/libkhrn_static.a
Binary file not shown.
Binary file modified hardfp/opt/vc/lib/libvcfiled_check.a
Binary file not shown.
Binary file modified hardfp/opt/vc/lib/libvchostif.a
Binary file not shown.
Binary file modified hardfp/opt/vc/lib/libvcilcs.a
Binary file not shown.
Binary file modified hardfp/opt/vc/lib/libvmcs_rpc_client.a
Binary file not shown.
16 changes: 8 additions & 8 deletions hardfp/opt/vc/src/hello_pi/hello_fft/gpu_fft_base.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

#include "bcm_host.h"
#include "gpu_fft.h"
#include "mailbox.h"

#define PERI_BASE 0x20000000
#define PERI_SIZE 0x02000000
#define BUS_TO_PHYS(x) ((x)&~0xC0000000)

// V3D spec: http://www.broadcom.com/docs/support/videocore/VideoCoreIV-AG100-R.pdf
#define V3D_L2CACTL (0xC00020>>2)
Expand All @@ -42,7 +42,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define V3D_DBQITE (0xC00e2c>>2)
#define V3D_DBQITC (0xC00e30>>2)

#define GPU_FFT_MEM_FLG 0xC // cached=0xC; direct=0x4
#define GPU_FFT_MEM_MAP 0x0 // cached=0x0; direct=0x20000000

#define GPU_FFT_NO_FLUSH 1
Expand Down Expand Up @@ -102,22 +101,23 @@ int gpu_fft_alloc (

if (qpu_enable(mb, 1)) return -1;

// Shared memory
handle = mem_alloc(mb, size, 4096, GPU_FFT_MEM_FLG);
// Shared memory : cached=0xC; direct=0x4
unsigned mem_flg = bcm_host_get_sdram_address() == 0x40000000 ? 0xC : 0x4;
handle = mem_alloc(mb, size, 4096, mem_flg);
if (!handle) {
qpu_enable(mb, 0);
return -3;
}

peri = (volatile unsigned *) mapmem(PERI_BASE, PERI_SIZE);
peri = (volatile unsigned *) mapmem(bcm_host_get_peripheral_address(), bcm_host_get_peripheral_size());
if (!peri) {
mem_free(mb, handle);
qpu_enable(mb, 0);
return -4;
}

ptr->vc = mem_lock(mb, handle);
ptr->arm.vptr = mapmem(ptr->vc+GPU_FFT_MEM_MAP, size);
ptr->arm.vptr = mapmem(BUS_TO_PHYS(ptr->vc+GPU_FFT_MEM_MAP), size);

base = (struct GPU_FFT_BASE *) ptr->arm.vptr;
base->peri = peri;
Expand All @@ -131,7 +131,7 @@ int gpu_fft_alloc (
void gpu_fft_base_release(struct GPU_FFT_BASE *base) {
int mb = base->mb;
unsigned handle = base->handle, size = base->size;
unmapmem((void*)base->peri, PERI_SIZE);
unmapmem((void*)base->peri, bcm_host_get_peripheral_size());
unmapmem((void*)base, size);
mem_unlock(mb, handle);
mem_free(mb, handle);
Expand Down
2 changes: 1 addition & 1 deletion hardfp/opt/vc/src/hello_pi/hello_fft/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ C2D = $(C) hello_fft_2d.c gpu_fft_trans.c
H1D = gpu_fft.h
H2D = gpu_fft.h gpu_fft_trans.h hello_fft_2d_bitmap.h

F = -lrt -lm
F = -lrt -lm -L../lib -L/opt/vc/lib/ -lbcm_host -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux

hello_fft.bin: $(S) $(C1D) $(H1D)
gcc -o hello_fft.bin $(F) $(C1D)
Expand Down
Binary file removed modules/3.18.3+/kernel/drivers/usb/serial/cp210x.ko
Binary file not shown.
Binary file removed modules/3.18.3+/kernel/drivers/usb/serial/option.ko
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed modules/3.18.3+/kernel/net/ipv6/ip6_udp_tunnel.ko
Binary file not shown.
Binary file removed modules/3.18.3+/kernel/net/ipv6/netfilter/ip6t_mh.ko
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed modules/3.18.3+/kernel/net/netfilter/xt_NFLOG.ko
Binary file not shown.
Binary file removed modules/3.18.3+/kernel/net/netfilter/xt_comment.ko
Binary file not shown.
Binary file removed modules/3.18.3+/kernel/net/netfilter/xt_mark.ko
Binary file not shown.
Binary file removed modules/3.18.3+/kernel/net/sched/em_cmp.ko
Binary file not shown.
Binary file removed modules/3.18.3+/kernel/net/sched/em_u32.ko
Binary file not shown.
Binary file removed modules/3.18.3+/modules.alias.bin
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 9b068fe

Please sign in to comment.