Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/misoc
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d50bb8c55ee7
Choose a base ref
...
head repository: m-labs/misoc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a8b9c126cdcb
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on May 27, 2015

  1. Copy the full SHA
    3f7e161 View commit details
  2. spiflash: now using 64k sectors

    fallen authored and sbourdeauducq committed May 27, 2015
    Copy the full SHA
    a8b9c12 View commit details
Showing with 6 additions and 6 deletions.
  1. +6 −6 software/libbase/spiflash.c
12 changes: 6 additions & 6 deletions software/libbase/spiflash.c
Original file line number Diff line number Diff line change
@@ -4,17 +4,17 @@

#include <spiflash.h>

#define PAGE_PROGRAM_CMD (0x02)
#define WRDI_CMD (0x04)
#define RDSR_CMD (0x05)
#define WREN_CMD (0x06)
#define SE_CMD (0x20)
#define PAGE_PROGRAM_CMD 0x02
#define WRDI_CMD 0x04
#define RDSR_CMD 0x05
#define WREN_CMD 0x06
#define SE_CMD 0xd8

#define BITBANG_CLK (1 << 1)
#define BITBANG_CS_N (1 << 2)
#define BITBANG_DQ_INPUT (1 << 3)

#define SR_WIP (1)
#define SR_WIP 1

static void flash_write_byte(unsigned char b);
static void flash_write_addr(unsigned int addr);